* m4/depend.m4 (AM_DEPENDENCIES): Don't leave `AC_PROG_CC' etc. in

clear.
* m4/init.m4: Likewise.
* m4/sanity.m4: s/conftestfile/conftest.file/.

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 621663589103682acffdeb38a0fd797945f12ee8..22efe7c0d280d5a518ee1bb604f1a8621be2eb36 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -61,8 +61,6 @@ POST_UNINSTALL = :
 AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AWK = @AWK@
-CC = @CC@
-CXX = @CXX@
 DEPDIR = @DEPDIR@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@

diff --git a/tests/ChangeLog b/tests/ChangeLog
index a21498de23c41bf18505586424c4fff1bb3ac610..b836f37b5cf659540dde4e6e1f0468ee1e1072af 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-26  Akim Demaille  <akim@epita.fr>
+
+       * defs (AUTOCONF, has_autoconf, needs_autoconf): New.
+       * ansi3.test, cond9.test, depacl2.test, install2.test, pr19.test,
+       * pr87.test, pr9.test, subobj3.test, target-cflags.test: Use them.
+
 2001-01-25  Pavel Roskin  <proski@gnu.org>
 
        * makevars.test: Disable shell tracing.

diff --git a/tests/ansi3.test b/tests/ansi3.test
index de75390f1351dec7bcc9f54faa4f7d3082df7fe0..858b0094953e8320bbb5e138cc091d3df17d270c 100755 (executable)
--- a/tests/ansi3.test
+++ b/tests/ansi3.test
@@ -29,7 +29,7 @@ main (int argc, char *argv[])
 END
 
 # Fail gracefully if no autoconf.
-(autoconf --version) > /dev/null 2>&1 || exit 0
+$needs_autoconf
 
 # Likewise for gcc.
 (gcc -v) > /dev/null 2>&1 || exit 0
@@ -37,7 +37,7 @@ END
 # We use gcc and not gcc -traditional as the latter fails on some
 # Linux boxes (Red Hat 5.1 in particular).
 $ACLOCAL \
-   && autoconf \
+   && $AUTOCONF \
    && $AUTOMAKE -a \
    && CC='gcc' ./configure \
    && $MAKE ANSI2KNR=./ansi2knr U=_ \

diff --git a/tests/cond9.test b/tests/cond9.test
index 504323cbd5ec25f7e15ff5a75589a9704661573b..ebe419c6a6737e94859d9436f1780c71211de350 100755 (executable)
--- a/tests/cond9.test
+++ b/tests/cond9.test
@@ -22,10 +22,10 @@ echo-something:
        echo '$(this)'
 END
 
-(autoconf --version) > /dev/null 2>&1 || exit 77
+$needs_autoconf
 
 $ACLOCAL \
-  && autoconf \
+  && $AUTOCONF \
   && $AUTOMAKE -a \
   && ./configure \
   && $MAKE echo-something | grep interesting > /dev/null

diff --git a/tests/defs b/tests/defs
index 4a6824db8ac647ea45a277e002911dd51ab47341..11f2f8ffc36e79462a1a4358595970f067d474be 100644 (file)
--- a/tests/defs
+++ b/tests/defs
@@ -54,6 +54,17 @@ test -z "$PERL" && PERL=perl
 # User can set MAKE to choose which make to use.  Must use GNU make.
 test -z "$MAKE" && MAKE=make
 
+# 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"
 
 # See how Automake should be run.  We put --foreign as the default

diff --git a/tests/install2.test b/tests/install2.test
index 4bd438fe714c1aaff2210a08ec8881721eeaf7e9..9980e119f6d98602e9a836d69ba6d55f7095d21c 100755 (executable)
--- a/tests/install2.test
+++ b/tests/install2.test
@@ -21,13 +21,13 @@ END
 rm -f install-sh mkinstalldirs missing
 
 # Fail gracefully if no autoconf.
-(autoconf --version) > /dev/null 2>&1 || exit 0
+$needs_autoconf
 
 # Likewise for gzip.
 (gzip --version) > /dev/null 2>&1 || exit 0
 
 $ACLOCAL || exit 1
-autoconf || exit 1
+$AUTOCONF || exit 1
 $AUTOMAKE -a || exit 1
 
 chmod 000 Makefile.am

diff --git a/tests/pr19.test b/tests/pr19.test
index 8c13873f2c1f89386e647e5ebb2b4e5390ad703f..1798404d57765957bda682e16be52a8da67c9843 100755 (executable)
--- a/tests/pr19.test
+++ b/tests/pr19.test
@@ -34,7 +34,7 @@ rm -f install-sh missing mkinstalldirs depcomp
 echo %% > foo.l
 
 # Fail gracefully if no autoconf.
-(autoconf --version) > /dev/null 2>&1 || exit 0
+$needs_autoconf
 
 # Likewise for gcc.
 (gcc -v) > /dev/null 2>&1 || exit 0
@@ -43,7 +43,7 @@ echo %% > foo.l
 (gzip --version) > /dev/null 2>&1 || exit 0
 
 $ACLOCAL || exit 1
-autoconf || exit 1
+$AUTOCONF || exit 1
 $AUTOMAKE -a || exit 1
 CC=gcc ./configure || exit 1
 $MAKE || exit 1

diff --git a/tests/pr87.test b/tests/pr87.test
index 0fa892a873aa5a410f681ccb2d65197a9d559b07..0db44d399cd4e2ccfa74713f08891a2edd0dbd9b 100755 (executable)
--- a/tests/pr87.test
+++ b/tests/pr87.test
@@ -27,7 +27,7 @@ AC_OUTPUT(Makefile `echo $subdirs | sed 's|\([a-z][a-z]*\)|\1/Makefile|g'`)
 EOF
 
 # Fail gracefully if no autoconf.
-(autoconf --version) > /dev/null 2>&1 || exit 0
+$needs_autoconf
 
 # Likewise for gcc.
 (gcc -v) > /dev/null 2>&1 || exit 0
@@ -41,7 +41,7 @@ rm missing install-sh mkinstalldirs
 # We use gcc and not gcc -traditional as the latter fails on some
 # Linux boxes (Red Hat 5.1 in particular).
 $ACLOCAL \
-   && autoconf \
+   && $AUTOCONF \
    && $AUTOMAKE -a \
    && cd build \
    && CC='gcc' ../configure \

diff --git a/tests/pr9.test b/tests/pr9.test
index 5e44d64b6d217c7521140b331ad0d35a88c6599b..735a3ae12931a3afd4d55f3e4bffc99716713aa7 100755 (executable)
--- a/tests/pr9.test
+++ b/tests/pr9.test
@@ -20,14 +20,14 @@ rm -f install-sh missing mkinstalldirs depcomp
 mkdir support
 
 # Fail gracefully if no autoconf.
-(autoconf --version) > /dev/null 2>&1 || exit 0
+$needs_autoconf
 
 # Likewise for gzip.
 (gzip --version) > /dev/null 2>&1 || exit 0
 
 $ACLOCAL || exit 1
 
-autoconf || exit 1
+$AUTOCONF || exit 1
 $AUTOMAKE -a -c || exit 1
 ./configure || exit 1
 $MAKE || exit 1

diff --git a/tests/subobj3.test b/tests/subobj3.test
index 64af1264c8796fa0c94bbb5e3edb90ada11dc260..bfd36ebbc232ef069101cd112c3f66ec5ab5d756 100755 (executable)
--- a/tests/subobj3.test
+++ b/tests/subobj3.test
@@ -37,7 +37,7 @@ main (int argc, char *argv[])
 END
 
 # Fail gracefully if no autoconf.
-(autoconf --version) > /dev/null 2>&1 || exit 0
+$needs_autoconf
 
 # Likewise for gcc.
 (gcc -v) > /dev/null 2>&1 || exit 0
@@ -45,7 +45,7 @@ END
 # We use gcc and not gcc -traditional as the latter fails on some
 # Linux boxes (Red Hat 5.1 in particular).
 $ACLOCAL \
-   && autoconf \
+   && $AUTOCONF \
    && $AUTOMAKE -a \
    && CC='gcc' ./configure \
    && $MAKE ANSI2KNR=./ansi2knr U=_ \

diff --git a/tests/target-cflags.test b/tests/target-cflags.test
index fd412fdefb8055b20f35f778d01f836ddaab0737..4179a55fa691e472fc304a09aeef49bfe547cd02 100755 (executable)
--- a/tests/target-cflags.test
+++ b/tests/target-cflags.test
@@ -38,13 +38,13 @@ int main(void)
 END
 
 # Fail gracefully if no autoconf.
-(autoconf --version) > /dev/null 2>&1 || exit 0
+$needs_autoconf
 
 # Likewise for gcc.
 (gcc -v) > /dev/null 2>&1 || exit 0
 
 $ACLOCAL \
-   && autoconf \
+   && $AUTOCONF \
    && $AUTOMAKE -a \
    && mkdir obj \
    && (cd obj && ../configure && $MAKE && ./foo && ./bar) \