* configure.ac: Export @am_AUTOCONF@.

* tests/defs.in (AUTOCONF): Define as @am_AUTOCONF@, not @AUTOCONF@,
so the test suite runs `autoconf' and not `missing --run autoconf'.
* tests/missing.test, tests/missing2.test: Arrange for missing
to be used in front of autoconf even if the user has exported
AUTOCONF.  This fixes two spurious failures reported by
Mark D. Baushke.

diff --git a/ChangeLog b/ChangeLog
index b00ac8f5ca8bb7ecf91d31d274bce220751c4d4d..7536657ead69bf4f53313de5792b50349eeccbfd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2004-10-12  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * configure.ac: Export @am_AUTOCONF@.
+       * tests/defs.in (AUTOCONF): Define as @am_AUTOCONF@, not @AUTOCONF@,
+       so the test suite runs `autoconf' and not `missing --run autoconf'.
+       * tests/missing.test, tests/missing2.test: Arrange for missing
+       to be used in front of autoconf even if the user has exported
+       AUTOCONF.  This fixes two spurious failures reported by
+       Mark D. Baushke.
+
        * lib/compile: Handle output.obj in addition to output.o.
        * tests/compile.test: Check for this.
 

diff --git a/Makefile.in b/Makefile.in
index b04402dcff795649c46a840541da1a5bedbab05d..c0259f8061cb0d38867e3520b8c6494b2abc4290 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -117,6 +117,7 @@ STRIP = @STRIP@
 TEX = @TEX@
 VERSION = @VERSION@
 ac_ct_STRIP = @ac_ct_STRIP@
+am_AUTOCONF = @am_AUTOCONF@
 am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@

diff --git a/configure b/configure
index c50a066fd058c7668fed3dc789d06992c3716c8a..663c0f5b0dfa187c69738997ceb8d6ceca6dfb88 100755 (executable)
--- a/configure
+++ b/configure
@@ -506,7 +506,7 @@ PACKAGE_STRING='GNU Automake 1.9a'
 PACKAGE_BUGREPORT='bug-automake@gnu.org'
 
 ac_unique_file="automake.in"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar APIVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY GREP EGREP FGREP LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os am_AUTOCONF INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar APIVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY GREP EGREP FGREP LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1534,10 +1534,11 @@ build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 
 
-# Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it;
-# this way we can run Autoconf tests from configure without being
-# bothered by `missing'.
-am_AUTOCONF=${AUTOCONF-autoconf}
+# Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it; this
+# way we can run Autoconf tests from configure (or from the test
+# suite) without being bothered by `missing'.
+am_AUTOCONF="${AUTOCONF-autoconf}"
+
 
 am__api_version="1.9a"
 # Find a good install program.  We prefer a C program (faster),
@@ -3153,6 +3154,7 @@ s,@build@,$build,;t t
 s,@build_cpu@,$build_cpu,;t t
 s,@build_vendor@,$build_vendor,;t t
 s,@build_os@,$build_os,;t t
+s,@am_AUTOCONF@,$am_AUTOCONF,;t t
 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t

diff --git a/configure.ac b/configure.ac
index 7458e9ddd98c1ec916532be6f5d563e1a0cb15a6..2ee14103d882bbad97a14c1784587273a5103361 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,10 +27,10 @@ AC_CONFIG_AUX_DIR(lib)
 
 AC_CANONICAL_BUILD
 
-# Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it;
-# this way we can run Autoconf tests from configure without being
-# bothered by `missing'.
-am_AUTOCONF=${AUTOCONF-autoconf}
+# Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it; this
+# way we can run Autoconf tests from configure (or from the test
+# suite) without being bothered by `missing'.
+AC_SUBST([am_AUTOCONF], ["${AUTOCONF-autoconf}"])
 
 AM_INIT_AUTOMAKE([1.8a dist-bzip2 filename-length-max=99])
 

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 526ee4f20a4a0294e2f99b098dcbceaf24171c98..050c131e3adc17486597b8036979f38a06be266b 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -108,6 +108,7 @@ STRIP = @STRIP@
 TEX = @TEX@
 VERSION = @VERSION@
 ac_ct_STRIP = @ac_ct_STRIP@
+am_AUTOCONF = @am_AUTOCONF@
 am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@

diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index c1bf04371bdfcc4e727d209cf2dcf3bf7bd49f8b..bcfc3b85f87c8f672d67870a8de1095c352c7e3b 100644 (file)
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -111,6 +111,7 @@ STRIP = @STRIP@
 TEX = @TEX@
 VERSION = @VERSION@
 ac_ct_STRIP = @ac_ct_STRIP@
+am_AUTOCONF = @am_AUTOCONF@
 am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@

diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index a59bf638aa52753b2f72628ba7bf36f8eee7f0d3..fd74b802de527efcc2106a98f46dccc71f1363d8 100644 (file)
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -90,6 +90,7 @@ STRIP = @STRIP@
 TEX = @TEX@
 VERSION = @VERSION@
 ac_ct_STRIP = @ac_ct_STRIP@
+am_AUTOCONF = @am_AUTOCONF@
 am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 225d9d5d1b768b42536f273af8049d731fae2355..e44c29c6296508bcba093913710514d117f8f900 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -114,6 +114,7 @@ STRIP = @STRIP@
 TEX = @TEX@
 VERSION = @VERSION@
 ac_ct_STRIP = @ac_ct_STRIP@
+am_AUTOCONF = @am_AUTOCONF@
 am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@

diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index cfa63096d7944858afc96bf00f29fd536cda7ef0..77e4d3051a996e0eb33a13701b3204bc432ea8d8 100644 (file)
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -101,6 +101,7 @@ STRIP = @STRIP@
 TEX = @TEX@
 VERSION = @VERSION@
 ac_ct_STRIP = @ac_ct_STRIP@
+am_AUTOCONF = @am_AUTOCONF@
 am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 15edff41ed6241f5e7c2432060cf09e2c2cb5255..a21814a6354de85b95084c4c33843cdebd718464 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -101,6 +101,7 @@ STRIP = @STRIP@
 TEX = @TEX@
 VERSION = @VERSION@
 ac_ct_STRIP = @ac_ct_STRIP@
+am_AUTOCONF = @am_AUTOCONF@
 am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@

diff --git a/tests/Makefile.in b/tests/Makefile.in
index fbf673035d073757b8947a37cd79c0a73447d757..99b0d5a0d8eaea58df1a960497cf27b51d02d5f9 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -91,6 +91,7 @@ STRIP = @STRIP@
 TEX = @TEX@
 VERSION = @VERSION@
 ac_ct_STRIP = @ac_ct_STRIP@
+am_AUTOCONF = @am_AUTOCONF@
 am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@

diff --git a/tests/defs.in b/tests/defs.in
index a384cb23969908711c6d0081b78cec5f09dfc88a..8a7dd283abad3d78bf9fd4b29704feeb01de214d 100644 (file)
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -70,7 +70,7 @@ export SHELL
 # User can override various tools used.
 test -z "$PERL" && PERL='@PERL@'
 test -z "$MAKE" && MAKE=make
-test -z "$AUTOCONF" && AUTOCONF="@AUTOCONF@"
+test -z "$AUTOCONF" && AUTOCONF="@am_AUTOCONF@"
 test -z "$AUTOHEADER" && AUTOHEADER="@AUTOHEADER@"
 test -z "$AUTOUPDATE" && AUTOUPDATE=autoupdate
 test -z "$MISSING" && MISSING=`pwd`/../lib/missing

diff --git a/tests/missing.test b/tests/missing.test
index 3993d61741da13dff4b68ce3525b542e5b5c1be6..5e6e5832152b05c734e08b8e91046d306b613964 100755 (executable)
--- a/tests/missing.test
+++ b/tests/missing.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -34,7 +34,14 @@ EOF
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --add-missing
-./configure
+
+# Make sure we do use missing, even if the user exported AUTOCONF.
+# (We cannot export this new value, because it would be used by Automake
+# when tracing, and missing is no good for this.)
+MYAUTOCONF="`pwd`/missing --run $AUTOCONF"
+unset AUTOCONF
+
+./configure AUTOCONF="$MYAUTOCONF"
 $MAKE
 $sleep
 # Hopefully the install version of Autoconf cannot compete with this one...
@@ -43,10 +50,10 @@ $MAKE distdir
 
 # Run again, but without missing, to ensure that timestamps were updated.
 export AUTOMAKE ACLOCAL
-./configure
+./configure AUTOCONF="$MYAUTOCONF"
 $MAKE
 
-# Make sure $MAKE fail when timestamps aren't updated and missing is not used.
+# Make sure $MAKE fails when timestamps aren't updated and missing is not used.
 $sleep
 touch aclocal.m4
 $MAKE && exit 1

diff --git a/tests/missing2.test b/tests/missing2.test
index 7d0a664322ba345d98fae9f36fbe5e8052afdace..79d877a7c277e04697a32c92a8b07aefc936a7d5 100755 (executable)
--- a/tests/missing2.test
+++ b/tests/missing2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -37,7 +37,13 @@ EOF
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --add-missing
-./configure
+
+# See missing.test for explanations about this.
+MYAUTOCONF="`pwd`/missing --run $AUTOCONF"
+unset AUTOCONF
+
+./configure AUTOCONF="$MYAUTOCONF"
+
 $MAKE
 $sleep
 # Hopefully the install version of Autoconf cannot compete with this one...
@@ -46,7 +52,7 @@ $MAKE distdir
 
 # Run again, but without missing, to ensure that timestamps were updated.
 export AUTOMAKE ACLOCAL
-./configure
+./configure AUTOCONF="$MYAUTOCONF"
 $MAKE
 
 # Make sure $MAKE fail when timestamps aren't updated and missing is not used.