Allow use of autoconf-2.69 and automake-1.12.

diff --git a/ChangeLog b/ChangeLog
index f2c66b09a02c7583061be81240b2a7ff8e2231f2..f38e9734e59682f64858945ff0143b13dba25cf6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-29  Bruno Haible  <bruno@clisp.org>
+
+       Allow use of autoconf-2.69 and automake-1.12.
+       * autogen.sh: Update comments.
+
 2012-02-18  Bruno Haible  <bruno@clisp.org>
 
        Improve ensurance that intmax_t gets defined in libasprintf.

diff --git a/autogen.sh b/autogen.sh
index 7f815a051a2e487fbc65f85f2e1eb7e6caaa3931..904254f701ed3bf3ea5e38c55efc5dbc56d01c9e 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,8 @@
 # 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..2.68 and automake-1.11.1 in the PATH.
+# This script requires autoconf-2.60..2.69 and automake-1.11.1..1.12 in the
+# PATH.
 # It also requires either
 #   - the GNULIB_TOOL environment variable pointing to the gnulib-tool script
 #     in a gnulib checkout, or