* 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.

6 files changed, 20 insertions, 27 deletions

diff --git a/m4/auxdir.m4 b/m4/auxdir.m4
index 810065247..1794f9b33 100644
--- 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 9fc010d6c..5887388f3 100644
--- 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 bec4bc2b4..d594e2c2c 100644
--- 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 2bf9dd3e3..f0222ee6e 100644
--- 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 008041a96..831d4be4f 100644
--- 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 4c9e37cc7..702da0dd8 100644
--- 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],