gnome-media r3848 - trunk

[malureau svn gnome org]

Author: malureau
Date: Sun Apr 20 16:58:36 2008
New Revision: 3848
URL: http://svn.gnome.org/viewvc/gnome-media?rev=3848&view=rev

Log:
=== release 2.23.1.1 ===

2008-04-20  Marc-Andrà Lureau  <marcandre lureau gmail com>

	* configure.in: release 2.23.1.1: intltool 0.35 is enough
	according to dobey. Fix a gnome-record configure regression.


Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/NEWS
   trunk/autogen.sh
   trunk/configure.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sun Apr 20 16:58:36 2008
@@ -18,7 +18,6 @@
 	gnome-doc-utils.make
 
 DISTCLEANFILES = po/.intltool-merge-cache \
-                 gnome-doc-utils.make \
-                 $(INTLTOOL_BUILT)
+                 gnome-doc-utils.make
 
 ACLOCAL_AMFLAGS = -I m4

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sun Apr 20 16:58:36 2008
@@ -1,4 +1,4 @@
-This is gnome-media 2.23.1
+This is gnome-media 2.23.1.1
 
 Changes since 2.22.0:
 

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Sun Apr 20 16:58:36 2008
@@ -19,7 +19,7 @@
     exit 1
 }
 
-REQUIRED_INTLTOOL_VERSION=0.39.99
+REQUIRED_INTLTOOL_VERSION=0.35
 
 # fix doc build before turning on common doc build
 # USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Apr 20 16:58:36 2008
@@ -1,7 +1,7 @@
 AC_PREREQ(2.53)
 AC_INIT(cddb-slave2)
 
-AS_VERSION(gnome-media, GNOME_MEDIA_VERSION, 2, 23, 2, 0,
+AS_VERSION(gnome-media, GNOME_MEDIA_VERSION, 2, 23, 1, 1,
   GM_RELEASE="yes", GM_RELEASE="no")
 
 AM_MAINTAINER_MODE
@@ -10,7 +10,7 @@
 
 AM_CONFIG_HEADER(config.h)
 
-IT_PROG_INTLTOOL([0.39.99])
+IT_PROG_INTLTOOL([0.35.0])
 
 AC_PROG_CC
 AC_ISC_POSIX
@@ -176,6 +176,15 @@
   PROGRAMS_GRECORD_ERROR="	gnome media profiles is disabled"
 fi		
 
+if test "x$HAVE_GST" = "xyes" && test "x$enable_grecord" == "xyes"; then
+  PROGRAMS_GRECORD="grecord"
+else
+  if test "x$HAVE_GST" = "xno"; then
+    AC_MSG_WARN([You need GStreamer installed for the mixer and recorder to work])
+    sleep 5 2>/dev/null
+  fi
+fi
+
 AC_SUBST(PROGRAMS_GRECORD)
 AM_CONDITIONAL(HAVE_GSTREAMER, test "x$HAVE_GST" = "xyes")