From: Alexandre Duret-Lutz Date: Sat, 19 Aug 2006 13:58:03 +0000 (+0000) Subject: * NEWS, configure.ac, m4/init.m4, m4/lispdir.m4, m4/mkdirp.m4: X-Git-Tag: Release-1-9b~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79a9f2047de5a58e87ddb00d2b2cdbbb3f1452a5;p=thirdparty%2Fautomake.git * 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 525ad0ea2..3e7e942cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-08-19 Alexandre Duret-Lutz + * 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 ccaf2e015..42db3a259 100644 --- 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 ba3fbeb28..cd9db9b02 100644 --- 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 f66538402..37d73c965 100644 --- 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 45b51cff4..62c2daf67 100644 --- 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 3e6a186a4..70a551b65 100644 --- 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 ])