* configure.in: Require Autoconf 2.57b to be sure

aclocal can use autom4te --language Autoconf-without-aclocal-m4.
* m4/init.m4: Likewise.  Move the AC_PREREQ and m4_pattern_allow
calls inside the AM_INIT_AUTOMAKE macro.
* m4/auxdir.m4, m4/cond.m4, m4/lex.m4, m4/regex.m4: Move
AC_PREREQ calls inside the macros.
* m4/header.m4: Remove AC_PREREQ.

diff --git a/ChangeLog b/ChangeLog
index fbb2c22..397527e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2003-08-24  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * configure.in: Require Autoconf 2.57b to be sure
+       aclocal can use autom4te --language Autoconf-without-aclocal-m4.
+       * m4/init.m4: Likewise.  Move the AC_PREREQ and m4_pattern_allow
+       calls inside the AM_INIT_AUTOMAKE macro.
+       * m4/auxdir.m4, m4/cond.m4, m4/lex.m4, m4/regex.m4: Move
+       AC_PREREQ calls inside the macros.
+       * m4/header.m4: Remove AC_PREREQ.
+
        * automake.in (file_contents_internal): Do not add newlines before
        empty actions.
 

diff --git a/NEWS b/NEWS
index 0823f95..98016d2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,7 @@ New in 1.7a:
 
 * Requirements
 
-  - Autoconf 2.55 or greater is required.
+  - Autoconf 2.57b or greater is required.
 
 * New features
 

diff --git a/configure b/configure
index fc62460..389a006 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57b for GNU Automake 1.7a.
+# Generated by GNU Autoconf 2.57c for GNU Automake 1.7a.
 #
 # Report bugs to <bug-automake@gnu.org>.
 #
@@ -854,7 +854,7 @@ test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
 GNU Automake configure 1.7a
-generated by GNU Autoconf 2.57b
+generated by GNU Autoconf 2.57c
 
 Copyright (C) 2003 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -868,7 +868,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by GNU Automake $as_me 1.7a, which was
-generated by GNU Autoconf 2.57b.  Invocation command line was
+generated by GNU Autoconf 2.57c.  Invocation command line was
 
   $ $0 $@
 
@@ -1407,7 +1407,6 @@ _ACEOF
 program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
 rm conftest.sed
 
-
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
 
@@ -1499,7 +1498,7 @@ else
 fi
 rmdir .tst 2>/dev/null
 
- # test to see if srcdir already configured
+# test to see if srcdir already configured
 if test "`cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
   { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
@@ -2234,7 +2233,7 @@ _ASBOX
 cat >&5 <<_CSEOF
 
 This file was extended by GNU Automake $as_me 1.7a, which was
-generated by GNU Autoconf 2.57b.  Invocation command line was
+generated by GNU Autoconf 2.57c.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -2289,7 +2288,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 GNU Automake config.status 1.7a
-configured by $0, generated by GNU Autoconf 2.57b,
+configured by $0, generated by GNU Autoconf 2.57c,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright (C) 2003 Free Software Foundation, Inc.

diff --git a/configure.in b/configure.in
index e28a8ca..d526e04 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-AC_PREREQ(2.54)
+AC_PREREQ(2.57b)
 AC_INIT([GNU Automake], [1.7a], [bug-automake@gnu.org])
 
 AC_CONFIG_SRCDIR(automake.in)

diff --git a/m4/auxdir.m4 b/m4/auxdir.m4
index 8100652..1794f9b 100644 (file)
--- a/m4/auxdir.m4
+++ b/m4/auxdir.m4
@@ -55,10 +55,9 @@
 # absolute PATH.  The drawback is that using absolute paths prevent a
 # configured tree to be moved without reconfiguration.
 
-# Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_AUX_DIR_EXPAND], [
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
 ])

diff --git a/m4/cond.m4 b/m4/cond.m4
index 9fc010d..5887388 100644 (file)
--- a/m4/cond.m4
+++ b/m4/cond.m4
@@ -17,15 +17,14 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# serial 5
-
-AC_PREREQ(2.52)
+# serial 6
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
        [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])
 AC_SUBST([$1_FALSE])

diff --git a/m4/header.m4 b/m4/header.m4
index bec4bc2..d594e2c 100644 (file)
--- a/m4/header.m4
+++ b/m4/header.m4
@@ -17,9 +17,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-AC_PREREQ([2.52])
-
-# serial 6
+# serial 7
 
 # AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
 AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])

diff --git a/m4/init.m4 b/m4/init.m4
index 2bf9dd3..f0222ee 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -21,13 +21,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# serial 10
-
-AC_PREREQ([2.55])
-
-# Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
-# the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+# serial 11
 
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
@@ -41,8 +35,12 @@ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
- AC_REQUIRE([AC_PROG_INSTALL])dnl
+[AC_PREREQ([2.57b])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
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
 # test to see if srcdir already configured
 if test "`cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then

diff --git a/m4/lex.m4 b/m4/lex.m4
index 008041a..831d4be 100644 (file)
--- a/m4/lex.m4
+++ b/m4/lex.m4
@@ -19,16 +19,15 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# serial 3
-
-AC_PREREQ(2.50)
+# serial 4
 
 # AM_PROG_LEX
 # -----------
 # Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
 # "missing" invocation, for better error output.
 AC_DEFUN([AM_PROG_LEX],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
 AC_REQUIRE([AC_PROG_LEX])dnl
 if test "$LEX" = :; then
   LEX=${am_missing_run}flex

diff --git a/m4/regex.m4 b/m4/regex.m4
index 4c9e37c..702da0d 100644 (file)
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -20,8 +20,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# serial 4
-AC_PREREQ(2.50)
+# serial 5
 
 # AM_WITH_REGEX
 # -------------
@@ -39,7 +38,8 @@ AC_PREREQ(2.50)
 # FIXME: This macro seems quite obsolete now since rx doesn't seem to
 # be maintained, while regex is.
 AC_DEFUN([AM_WITH_REGEX],
-[AC_LIBSOURCES([rx.h, rx.c, regex.c, regex.h])dnl
+[AC_PREREQ(2.50)dnl
+AC_LIBSOURCES([rx.h, rx.c, regex.c, regex.h])dnl
 AC_MSG_CHECKING([which of GNU rx or gawk's regex is wanted])
 AC_ARG_WITH(regex,
 [  --without-regex         use GNU rx in lieu of gawk's regex for matching],