* NEWS, configure.ac, m4/init.m4, m4/lispdir.m4, m4/mkdirp.m4:

Require Autoconf 2.60 instead of some intermediate development
version.

diff --git a/ChangeLog b/ChangeLog
index 525ad0ea292465f1fa58055d45263116f00f3be8..3e7e942cc8a01dbf13598fa4ef731b003369fd9f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-08-19  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * NEWS, configure.ac, m4/init.m4, m4/lispdir.m4, m4/mkdirp.m4:
+       Require Autoconf 2.60 instead of some intermediate development
+       version.
+
        * doc/automake.texi (Standard Directory Variables): Fix multitable
        width.
        (Autotools Introduction): Fix @uref usage.

diff --git a/NEWS b/NEWS
index ccaf2e015144894df6fb61e5e58be44a05aa7add..42db3a2598113f30ee89a31707980693a983cab8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 New in 1.9a:
 
-  - Autoconf 2.59a is required.
+  - Autoconf 2.60 is required.
 
   - Perl 5.6 or greater is required.
 

diff --git a/configure.ac b/configure.ac
index ba3fbeb2890b46a33e13a3083ef2cb3e704d4a88..cd9db9b0243def92865d7e89160129451e18f63e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,8 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
-dnl Require Autoconf 2.59a for AC_REQUIRE_AUX_FILE.
-AC_PREREQ(2.59a)
+dnl Require Autoconf 2.60 for AC_REQUIRE_AUX_FILE.
+AC_PREREQ(2.60)
 AC_INIT([GNU Automake], [1.9a], [bug-automake@gnu.org])
 
 AC_CONFIG_SRCDIR(automake.in)

diff --git a/m4/init.m4 b/m4/init.m4
index f6653840297984e1eacbece1bef3ef6b147030ea..37d73c9657acbf47d4b2a3b54d45697add06a43e 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -24,7 +24,7 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.59c])dnl
+[AC_PREREQ([2.60])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl

diff --git a/m4/lispdir.m4 b/m4/lispdir.m4
index 45b51cff4e79ead0200388b972b33461c6260279..62c2daf67b89434d4e50ad19beb73131b7f02d3e 100644 (file)
--- a/m4/lispdir.m4
+++ b/m4/lispdir.m4
@@ -15,7 +15,7 @@
 # AM_PATH_LISPDIR
 # ---------------
 AC_DEFUN([AM_PATH_LISPDIR],
-[AC_PREREQ([2.59c])dnl
+[AC_PREREQ([2.60])dnl
  # If set to t, that means we are running in a shell under Emacs.
  # If you have an Emacs named "t", then use the full path.
  test x"$EMACS" = xt && EMACS=

diff --git a/m4/mkdirp.m4 b/m4/mkdirp.m4
index 3e6a186a41b9963de01501f11eb32e5f15a84d7d..70a551b656ddcb871a577e800de16fe0378b7098 100644 (file)
--- a/m4/mkdirp.m4
+++ b/m4/mkdirp.m4
@@ -9,7 +9,7 @@
 # ---------------
 # Check for `mkdir -p'.
 AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.59c])dnl
+[AC_PREREQ([2.60])dnl
 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])dnl
 ])