Use newer versions of autoconf and automake.

bhaible · bhaible · commit cb3625575391 · 2009-06-21T13:06:03.000+02:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-11  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.devel (AUTOCONF, AUTOHEADER): Require version 2.61.
+	(AUTOMAKE, ACLOCAL): Require version 1.10.
+
 2007-10-26  Bruno Haible  <bruno@clisp.org>
 
 	* m4/libtool.m4: Update, based on libtool-1.5.24.
diff --git a/Makefile.devel b/Makefile.devel
@@ -4,10 +4,10 @@
 
 SHELL = /bin/sh
 MAKE = make
-AUTOCONF = autoconf-2.60
-AUTOHEADER = autoheader-2.60
-AUTOMAKE = automake-1.9
-ACLOCAL = aclocal-1.9
+AUTOCONF = autoconf-2.61
+AUTOHEADER = autoheader-2.61
+AUTOMAKE = automake-1.10
+ACLOCAL = aclocal-1.10
 GPERF = gperf
 CC = gcc
 CFLAGS = -O
diff --git a/autogen.sh b/autogen.sh
@@ -4,7 +4,7 @@
 # also regenerates all aclocal.m4, config.h.in, Makefile.in, configure files
 # with new versions of autoconf or automake.
 #
-# This script requires autoconf-2.60 and automake-1.9 in the PATH.
+# This script requires autoconf-2.61 and automake-1.10 in the PATH.
 # It also requires either
 #   - the GNULIB_TOOL environment variable pointing to the gnulib-tool script
 #     in a gnulib checkout, or
diff --git a/libcharset/ChangeLog b/libcharset/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-11  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.devel (AUTOCONF, AUTOHEADER): Require version 2.61.
+	(ACLOCAL): Require version 1.10.
+
 2007-10-26  Bruno Haible  <bruno@clisp.org>
 
 	* m4/libtool.m4: Update, based on libtool-1.5.24.
diff --git a/libcharset/Makefile.devel b/libcharset/Makefile.devel
@@ -3,9 +3,9 @@
 
 SHELL = /bin/sh
 MAKE = make
-AUTOCONF = autoconf-2.60
-AUTOHEADER = autoheader-2.60
-ACLOCAL = aclocal-1.9
+AUTOCONF = autoconf-2.61
+AUTOHEADER = autoheader-2.61
+ACLOCAL = aclocal-1.10
 CP = cp
 RM = rm -f
 
diff --git a/libcharset/autogen.sh b/libcharset/autogen.sh
@@ -2,7 +2,7 @@
 # Convenience script for regenerating all aclocal.m4, config.h.in, Makefile.in,
 # configure files with new versions of autoconf or automake.
 #
-# This script requires autoconf-2.60 and automake-1.9 in the PATH.
+# This script requires autoconf-2.61 and automake-1.10 in the PATH.
 # It also requires either
 #   - the GNULIB_TOOL environment variable pointing to the gnulib-tool script
 #     in a gnulib checkout, or

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# also regenerates all aclocal.m4, config.h.in, Makefile.in, configure files`
`5`	`5`	`# with new versions of autoconf or automake.`
`6`	`6`	`#`
`7`		`-# This script requires autoconf-2.60 and automake-1.9 in the PATH.`
	`7`	`+# This script requires autoconf-2.61 and automake-1.10 in the PATH.`
`8`	`8`	`# It also requires either`
`9`	`9`	`# - the GNULIB_TOOL environment variable pointing to the gnulib-tool script`
`10`	`10`	`# in a gnulib checkout, or`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# Convenience script for regenerating all aclocal.m4, config.h.in, Makefile.in,`
`3`	`3`	`# configure files with new versions of autoconf or automake.`
`4`	`4`	`#`
`5`		`-# This script requires autoconf-2.60 and automake-1.9 in the PATH.`
	`5`	`+# This script requires autoconf-2.61 and automake-1.10 in the PATH.`
`6`	`6`	`# It also requires either`
`7`	`7`	`# - the GNULIB_TOOL environment variable pointing to the gnulib-tool script`
`8`	`8`	`# in a gnulib checkout, or`