ensure-autoconf-2.52.patch

[Alexandre Duret-Lutz]

>>> "adl" == Alexandre Duret-Lutz <address@hidden> writes:

>>> "Akim" == Akim Demaille <address@hidden> writes:
 adl> [...]

 >>> Personally, I'd prefer that Automake's configure abort if
 >>> Autoconf is not found.  (This will probably be important
 >>> when Automake switches to --traces)

 Akim> Right.  Please, do that if you prefer.

 adl> Ok, I will.

Index: ChangeLog
from  Alexandre Duret-Lutz  <address@hidden>

        * configure.in: Test for Autoconf >= 2.52.
        * tests/defs (needs_autoconf, has_autoconf): Delete definition.
        * tests/ansi3.test, tests/ansi5.test, tests/ccnoco.test,
        tests/cond4.test, tests/cond9.test, tests/cond16.test,
        tests/cond18.test, tests/cond19.test, tests/cond20.test,
        tests/confsub.test, tests/depcomp2.test, tests/depdist.test,
        tests/depend2.test, tests/dirname.test, tests/distname.test,
        tests/extra5.test, tests/install2.test, tests/lex3.test,
        tests/make.test, tests/nobase.test, tests/pr9.test,
        tests/pr87.test, tests/stamph2.test, tests/subdir5.test,
        tests/subdirbuiltsources.test, tests/subobj3.test,
        tests/subobj5.test, tests/subobj6.test, tests/substref.test,
        tests/target-cflags.test, tests/yacc4.test, tests/yacc7.test,
        tests/yaccvpath.test: Do not use $needs_autoconf.

Index: configure.in
===================================================================
RCS file: /cvs/automake/automake/configure.in,v
retrieving revision 1.92
diff -u -r1.92 configure.in
--- configure.in        2001/12/14 16:32:12     1.92
+++ configure.in        2001/12/15 15:11:10
@@ -39,6 +39,12 @@
    AC_MSG_ERROR([perl 5.005 or better is required])
 }
 
+echo 'AC''_PREREQ(2.52)' > conftest.ac
+AM_RUN_LOG([eval $AUTOCONF -o /dev/null conftest.ac]) || {
+   AC_MSG_ERROR([Autoconf 2.52 or better is required])
+}
+rm conftest.ac
+
 AC_CONFIG_FILES([automake], [chmod +x automake])
 AC_CONFIG_FILES([aclocal], [chmod +x aclocal])
 
Index: tests/ansi3.test
===================================================================
RCS file: /cvs/automake/automake/tests/ansi3.test,v
retrieving revision 1.6
diff -u -r1.6 ansi3.test
--- ansi3.test  2001/08/28 04:45:20     1.6
+++ ansi3.test  2001/12/15 15:11:11
@@ -28,9 +28,6 @@
 }
 END
 
-# Fail gracefully if no autoconf.
-$needs_autoconf
-
 # Likewise for gcc.
 (gcc -v) > /dev/null 2>&1 || exit 77
 
Index: tests/ansi5.test
===================================================================
RCS file: /cvs/automake/automake/tests/ansi5.test,v
retrieving revision 1.2
diff -u -r1.2 ansi5.test
--- ansi5.test  2001/08/28 04:45:20     1.2
+++ ansi5.test  2001/12/15 15:11:11
@@ -48,8 +48,6 @@
 }
 END
 
-$needs_autoconf
-
 (gcc -v) > /dev/null 2>&1 || exit 77
 
 set -e
Index: tests/ccnoco.test
===================================================================
RCS file: /cvs/automake/automake/tests/ccnoco.test,v
retrieving revision 1.3
diff -u -r1.3 ccnoco.test
--- ccnoco.test 2001/08/28 04:45:20     1.3
+++ ccnoco.test 2001/12/15 15:11:11
@@ -39,7 +39,6 @@
 }
 END
 
-$needs_autoconf
 gcc -v || exit 77
 
 cat > Mycomp << 'END'
Index: tests/cond16.test
===================================================================
RCS file: /cvs/automake/automake/tests/cond16.test,v
retrieving revision 1.3
diff -u -r1.3 cond16.test
--- cond16.test 2001/08/28 04:45:20     1.3
+++ cond16.test 2001/12/15 15:11:11
@@ -32,7 +32,6 @@
 
 END
 
-$needs_autoconf
 (gcc -v) > /dev/null 2>&1 || exit 77
 
 # Ignore user CFLAGS.
Index: tests/cond18.test
===================================================================
RCS file: /cvs/automake/automake/tests/cond18.test,v
retrieving revision 1.2
diff -u -r1.2 cond18.test
--- cond18.test 2001/08/28 04:45:20     1.2
+++ cond18.test 2001/12/15 15:11:11
@@ -38,7 +38,6 @@
 bin_PROGRAMS = helldl
 END
 
-$needs_autoconf
 (gcc -v) > /dev/null 2>&1 || exit 77
 
 # Ignore user CFLAGS.
Index: tests/cond19.test
===================================================================
RCS file: /cvs/automake/automake/tests/cond19.test,v
retrieving revision 1.2
diff -u -r1.2 cond19.test
--- cond19.test 2001/08/28 04:45:20     1.2
+++ cond19.test 2001/12/15 15:11:11
@@ -40,7 +40,6 @@
 bin_PROGRAMS = helldl
 END
 
-$needs_autoconf
 (gcc -v) > /dev/null 2>&1 || exit 77
 
 # Ignore user CFLAGS.
Index: tests/cond20.test
===================================================================
RCS file: /cvs/automake/automake/tests/cond20.test,v
retrieving revision 1.1
diff -u -r1.1 cond20.test
--- cond20.test 2001/08/08 17:42:26     1.1
+++ cond20.test 2001/12/15 15:11:11
@@ -28,8 +28,6 @@
 bin_PROGRAMS = helldl
 END
 
-$needs_autoconf
-
 set -e
 
 $ACLOCAL
Index: tests/cond4.test
===================================================================
RCS file: /cvs/automake/automake/tests/cond4.test,v
retrieving revision 1.6
diff -u -r1.6 cond4.test
--- cond4.test  2001/10/21 18:03:20     1.6
+++ cond4.test  2001/12/15 15:11:11
@@ -30,8 +30,6 @@
        @echo $(targ_OBJECTS)
 END
 
-$needs_autoconf
-
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
Index: tests/cond9.test
===================================================================
RCS file: /cvs/automake/automake/tests/cond9.test,v
retrieving revision 1.3
diff -u -r1.3 cond9.test
--- cond9.test  2001/03/23 16:23:53     1.3
+++ cond9.test  2001/12/15 15:11:11
@@ -22,8 +22,6 @@
        echo '$(this)'
 END
 
-$needs_autoconf
-
 $ACLOCAL \
   && $AUTOCONF \
   && $AUTOMAKE -a \
Index: tests/confsub.test
===================================================================
RCS file: /cvs/automake/automake/tests/confsub.test,v
retrieving revision 1.15
diff -u -r1.15 confsub.test
--- confsub.test        2001/12/06 19:23:24     1.15
+++ confsub.test        2001/12/15 15:11:11
@@ -5,9 +5,6 @@
 
 . $srcdir/defs || exit 1
 
-# Fail gracefully if no autoconf.
-$needs_autoconf
-
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
Index: tests/defs
===================================================================
RCS file: /cvs/automake/automake/tests/defs,v
retrieving revision 1.40
diff -u -r1.40 defs
--- defs        2001/11/28 12:30:16     1.40
+++ defs        2001/12/15 15:11:11
@@ -82,13 +82,6 @@
 
 # User can set which tools from Autoconf to use.
 test -z "$AUTOCONF" && AUTOCONF=autoconf
-if ($AUTOCONF --version) >/dev/null 2>&1; then
-  has_autoconf=:
-  needs_autoconf=:
-else
-  has_autoconf=false
-  needs_autoconf='exit 77'
-fi
 
 
 echo "=== Running test $0"
Index: tests/depcomp2.test
===================================================================
RCS file: /cvs/automake/automake/tests/depcomp2.test,v
retrieving revision 1.3
diff -u -r1.3 depcomp2.test
--- depcomp2.test       2001/10/28 14:00:28     1.3
+++ depcomp2.test       2001/12/15 15:11:11
@@ -26,9 +26,6 @@
 
 : > subdir/foo.c
 
-# Fail gracefully if no autoconf.
-$needs_autoconf
-
 # Likewise for gcc.
 (gcc -v) > /dev/null 2>&1 || exit 77
 
Index: tests/depdist.test
===================================================================
RCS file: /cvs/automake/automake/tests/depdist.test,v
retrieving revision 1.2
diff -u -r1.2 depdist.test
--- depdist.test        2001/12/06 19:23:24     1.2
+++ depdist.test        2001/12/15 15:11:11
@@ -5,9 +5,6 @@
 
 . $srcdir/defs || exit 1
 
-# Fail gracefully if no autoconf.
-$needs_autoconf
-
 rm -f configure.in
 
 mkdir config
Index: tests/depend2.test
===================================================================
RCS file: /cvs/automake/automake/tests/depend2.test,v
retrieving revision 1.7
diff -u -r1.7 depend2.test
--- depend2.test        2001/08/28 04:45:20     1.7
+++ depend2.test        2001/12/15 15:11:11
@@ -31,9 +31,6 @@
 }
 END
 
-# Fail gracefully if no autoconf.
-$needs_autoconf
-
 # Likewise for gcc.
 (gcc -v) > /dev/null 2>&1 || exit 77
 
Index: tests/dirname.test
===================================================================
RCS file: /cvs/automake/automake/tests/dirname.test,v
retrieving revision 1.4
diff -u -r1.4 dirname.test
--- dirname.test        2001/10/10 13:05:13     1.4
+++ dirname.test        2001/12/15 15:11:11
@@ -15,9 +15,6 @@
 echo "7 /file                  = _AM_DIRNAME([/file])"
 END
 
-# Fail gracefully if no autoconf.
-$needs_autoconf
-
 $ACLOCAL || exit 1
 # fail gracefully if autoconf didn't support support our regexps anyhow
 $AUTOCONF || exit 77
Index: tests/distname.test
===================================================================
RCS file: /cvs/automake/automake/tests/distname.test,v
retrieving revision 1.1
diff -u -r1.1 distname.test
--- distname.test       2001/05/14 05:09:31     1.1
+++ distname.test       2001/12/15 15:11:11
@@ -22,8 +22,6 @@
 
 set -e
 
-$needs_autoconf
-
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --include-deps --copy --add-missing
Index: tests/extra5.test
===================================================================
RCS file: /cvs/automake/automake/tests/extra5.test,v
retrieving revision 1.2
diff -u -r1.2 extra5.test
--- extra5.test 2001/12/06 19:23:24     1.2
+++ extra5.test 2001/12/15 15:11:11
@@ -5,9 +5,6 @@
 
 . $srcdir/defs || exit 1
 
-# Fail gracefully if no autoconf.
-$needs_autoconf
-
 echo AC_OUTPUT >> configure.in
 
 cat > Makefile.am << 'END'
Index: tests/install2.test
===================================================================
RCS file: /cvs/automake/automake/tests/install2.test,v
retrieving revision 1.9
diff -u -r1.9 install2.test
--- install2.test       2001/07/22 00:27:52     1.9
+++ install2.test       2001/12/15 15:11:11
@@ -17,9 +17,6 @@
 SUBDIRS = .
 END
 
-# Fail gracefully if no autoconf.
-$needs_autoconf
-
 # Likewise for gzip.
 (gzip --version) > /dev/null 2>&1 || exit 77
 
Index: tests/lex3.test
===================================================================
RCS file: /cvs/automake/automake/tests/lex3.test,v
retrieving revision 1.5
diff -u -r1.5 lex3.test
--- lex3.test   2001/11/26 18:04:19     1.5
+++ lex3.test   2001/12/15 15:11:11
@@ -5,9 +5,6 @@
 
 . $srcdir/defs || exit 1
 
-# Fail gracefully if no autoconf.
-$needs_autoconf
-
 # Likewise for GNU Make (we need VPATH support for `make distcheck').
 $needs_gnu_make
 
Index: tests/make.test
===================================================================
RCS file: /cvs/automake/automake/tests/make.test,v
retrieving revision 1.4
diff -u -r1.4 make.test
--- make.test   2001/07/17 05:53:49     1.4
+++ make.test   2001/12/15 15:11:11
@@ -14,7 +14,6 @@
 
 : > Makefile.am
 
-$needs_autoconf
 $needs_gnu_make
 
 set -e
Index: tests/nobase.test
===================================================================
RCS file: /cvs/automake/automake/tests/nobase.test,v
retrieving revision 1.3
diff -u -r1.3 nobase.test
--- nobase.test 2001/12/06 19:23:24     1.3
+++ nobase.test 2001/12/15 15:11:11
@@ -3,9 +3,6 @@
 
 . $srcdir/defs || exit 1
 
-# Fail gracefully if no autoconf.
-$needs_autoconf
-
 cat >> configure.in <<'EOF'
 AC_OUTPUT
 EOF
Index: tests/pr87.test
===================================================================
RCS file: /cvs/automake/automake/tests/pr87.test,v
retrieving revision 1.9
diff -u -r1.9 pr87.test
--- pr87.test   2001/08/28 04:45:20     1.9
+++ pr87.test   2001/12/15 15:11:11
@@ -26,9 +26,6 @@
 AC_OUTPUT(Makefile `echo $subdirs | sed 's|\([a-z][a-z]*\)|\1/Makefile|g'`)
 EOF
 
-# Fail gracefully if no autoconf.
-$needs_autoconf
-
 # Likewise for gcc.
 (gcc -v) > /dev/null 2>&1 || exit 77
 
Index: tests/pr9.test
===================================================================
RCS file: /cvs/automake/automake/tests/pr9.test,v
retrieving revision 1.6
diff -u -r1.6 pr9.test
--- pr9.test    2001/07/25 15:27:36     1.6
+++ pr9.test    2001/12/15 15:11:11
@@ -15,9 +15,6 @@
 
 mkdir support
 
-# Fail gracefully if no autoconf.
-$needs_autoconf
-
 # Likewise for gzip.
 (gzip --version) > /dev/null 2>&1 || exit 77
 
Index: tests/stamph2.test
===================================================================
RCS file: /cvs/automake/automake/tests/stamph2.test,v
retrieving revision 1.4
diff -u -r1.4 stamph2.test
--- stamph2.test        2001/12/06 19:23:24     1.4
+++ stamph2.test        2001/12/15 15:11:11
@@ -3,9 +3,6 @@
 # Make sure stamp-h* files are created where we expect
 . $srcdir/defs || exit 1
 
-# Fail gracefully if no autoconf.
-$needs_autoconf
-
 cat > configure.in << END
 AC_INIT(Makefile.am)
 AM_INIT_AUTOMAKE($me, 1.0)
Index: tests/subdir5.test
===================================================================
RCS file: /cvs/automake/automake/tests/subdir5.test,v
retrieving revision 1.1
diff -u -r1.1 subdir5.test
--- subdir5.test        2001/05/07 16:31:01     1.1
+++ subdir5.test        2001/12/15 15:11:11
@@ -29,8 +29,6 @@
 
 set -e
 
-$needs_autoconf
-
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --include-deps --copy --add-missing
Index: tests/subdirbuiltsources.test
===================================================================
RCS file: /cvs/automake/automake/tests/subdirbuiltsources.test,v
retrieving revision 1.4
diff -u -r1.4 subdirbuiltsources.test
--- subdirbuiltsources.test     2001/12/06 19:23:24     1.4
+++ subdirbuiltsources.test     2001/12/15 15:11:11
@@ -6,9 +6,6 @@
 
 . $srcdir/defs || exit 1
 
-# Fail gracefully if no autoconf.
-$needs_autoconf
-
 set -e
 
 mkdir lib
Index: tests/subobj3.test
===================================================================
RCS file: /cvs/automake/automake/tests/subobj3.test,v
retrieving revision 1.8
diff -u -r1.8 subobj3.test
--- subobj3.test        2001/08/28 04:45:20     1.8
+++ subobj3.test        2001/12/15 15:11:11
@@ -32,9 +32,6 @@
 }
 END
 
-# Fail gracefully if no autoconf.
-$needs_autoconf
-
 # Likewise for gcc.
 (gcc -v) > /dev/null 2>&1 || exit 77
 
Index: tests/subobj5.test
===================================================================
RCS file: /cvs/automake/automake/tests/subobj5.test,v
retrieving revision 1.2
diff -u -r1.2 subobj5.test
--- subobj5.test        2001/05/07 16:29:39     1.2
+++ subobj5.test        2001/12/15 15:11:11
@@ -24,8 +24,6 @@
 
 set -e
 
-$needs_autoconf
-
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --include-deps --copy --add-missing
Index: tests/subobj6.test
===================================================================
RCS file: /cvs/automake/automake/tests/subobj6.test,v
retrieving revision 1.3
diff -u -r1.3 subobj6.test
--- subobj6.test        2001/05/08 17:58:03     1.3
+++ subobj6.test        2001/12/15 15:11:11
@@ -34,8 +34,6 @@
 
 set -e
 
-$needs_autoconf
-
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --include-deps --copy --add-missing
Index: tests/substref.test
===================================================================
RCS file: /cvs/automake/automake/tests/substref.test,v
retrieving revision 1.5
diff -u -r1.5 substref.test
--- substref.test       2001/08/28 04:45:20     1.5
+++ substref.test       2001/12/15 15:11:11
@@ -30,7 +30,6 @@
 bin_PROGRAMS = helldl
 END
 
-$needs_autoconf
 (gcc -v) > /dev/null 2>&1 || exit 77
 
 # Ignore user CFLAGS.
Index: tests/target-cflags.test
===================================================================
RCS file: /cvs/automake/automake/tests/target-cflags.test,v
retrieving revision 1.6
diff -u -r1.6 target-cflags.test
--- target-cflags.test  2001/05/15 18:04:56     1.6
+++ target-cflags.test  2001/12/15 15:11:11
@@ -37,9 +37,6 @@
 #endif
 END
 
-# Fail gracefully if no autoconf.
-$needs_autoconf
-
 # Likewise for gcc.
 (gcc -v) > /dev/null 2>&1 || exit 77
 
Index: tests/yacc4.test
===================================================================
RCS file: /cvs/automake/automake/tests/yacc4.test,v
retrieving revision 1.2
diff -u -r1.2 yacc4.test
--- yacc4.test  2001/06/24 03:38:27     1.2
+++ yacc4.test  2001/12/15 15:11:11
@@ -4,8 +4,6 @@
 
 . $srcdir/defs || exit 1
 
-# Fail gracefully if no autoconf.
-$needs_autoconf
 # Likewise for some other tools.
 (gcc -v) > /dev/null 2>&1 || exit 77
 (bison -V) > /dev/null 2>&1 || exit 77
Index: tests/yacc7.test
===================================================================
RCS file: /cvs/automake/automake/tests/yacc7.test,v
retrieving revision 1.4
diff -u -r1.4 yacc7.test
--- yacc7.test  2001/10/20 11:15:56     1.4
+++ yacc7.test  2001/12/15 15:11:11
@@ -6,7 +6,6 @@
 . $srcdir/defs || exit 1
 
 $needs_gnu_make
-$needs_autoconf
 
 cat > configure.in << 'END'
 AC_INIT
Index: tests/yaccvpath.test
===================================================================
RCS file: /cvs/automake/automake/tests/yaccvpath.test,v
retrieving revision 1.6
diff -u -r1.6 yaccvpath.test
--- yaccvpath.test      2001/05/15 02:21:54     1.6
+++ yaccvpath.test      2001/12/15 15:11:11
@@ -8,8 +8,6 @@
 
 . $srcdir/defs || exit 1
 
-# Fail gracefully if no autoconf.
-$needs_autoconf
 # Likewise for some other tools.
 (gcc -v) > /dev/null 2>&1 || exit 77
 (bison -V) > /dev/null 2>&1 || exit 77

-- 
Alexandre Duret-Lutz