libgnome r3747 - trunk

[chpe svn gnome org]

Author: chpe
Date: Mon Jun 16 13:41:23 2008
New Revision: 3747
URL: http://svn.gnome.org/viewvc/libgnome?rev=3747&view=rev

Log:
Prepare 2.23.4.


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

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Mon Jun 16 13:41:23 2008
@@ -1,20 +1,12 @@
-AUTOMAKE_OPTIONS = 1.7
-
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
-
 SUBDIRS = libgnome monikers schemas gnome-data po doc
 
 EXTRA_DIST = \
 	COPYING.LIB		\
 	NEWS			\
 	MAINTAINERS		\
-	intltool-extract.in	\
-	intltool-merge.in	\
-	intltool-update.in	\
 	libgnome-zip.in		\
 	gtk-doc.make
 
-DISTCLEANFILES = \
-  intltool-extract \
-  intltool-merge \
-  intltool-update
+DISTCLEANFILES =
+
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Mon Jun 16 13:41:23 2008
@@ -14,4 +14,6 @@
     exit 1
 }
 
-REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh
+REQUIRED_AUTOMAKE_VERSION=1.9
+REQUIRED_INTLTOOL_VERSION=0.40.0
+. gnome-autogen.sh

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Jun 16 13:41:23 2008
@@ -58,7 +58,7 @@
 ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
 AC_SUBST(ACLOCAL_AMFLAGS)
 
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.40.0])
 
 AC_ISC_POSIX
 AC_PROG_CC