Fixes PR automake/175:

	* tests/target-cflags.test: Use $needs_gnu_make.
	* tests/exsource.test: Use $needs_gnu_make.
	* tests/make.test: Require GNU make.
	* tests/defs (needs_gnu_make): Compute.

diff --git a/ChangeLog b/ChangeLog
index 6d74b9e609b01487c7ac9d53876d98f1469320e9..3a0b36ccc061f3344c8bc36a61357775accd9f0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-05-15  Tom Tromey  <tromey@redhat.com>
+
+       Fixes PR automake/175:
+       * tests/target-cflags.test: Use $needs_gnu_make.
+       * tests/exsource.test: Use $needs_gnu_make.
+       * tests/make.test: Require GNU make.
+       * tests/defs (needs_gnu_make): Compute.
+
 2001-05-14  Tom Tromey  <tromey@redhat.com>
 
        * lib/ylwrap: Fixed quoting on regular expression.  Fixes

diff --git a/tests/defs b/tests/defs
index 500aedb93e432f7d00aad60048ea19a7168a023e..174717868bb705feaaabf55e0e3f91cfada20595 100644 (file)
--- a/tests/defs
+++ b/tests/defs
@@ -55,6 +55,12 @@ test -z "$PERL" && PERL=perl
 # User can set MAKE to choose which make to use.  Must use GNU make.
 test -z "$MAKE" && MAKE=make
 
+if ($MAKE --version) > /dev/null 2>&1; then
+   needs_gnu_make=:
+else
+   needs_gnu_make='exit 77'
+fi
+
 # User can set which tools from Autoconf to use.
 test -z "$AUTOCONF" && AUTOCONF=autoconf
 if ($AUTOCONF --version) >/dev/null 2>&1; then

diff --git a/tests/exsource.test b/tests/exsource.test
index 0bd9aaa638659724eb74041a8912afc88b0a5ea6..19d4054fbc90b67ca7f7c679e62730c2d6986546 100755 (executable)
--- a/tests/exsource.test
+++ b/tests/exsource.test
@@ -5,11 +5,7 @@
 
 . $srcdir/defs || exit 1
 
-# This test relies on GNU make.
-$MAKE --version > /dev/null 2>&1 || {
-   # Nope.
-   exit 77
-}
+$needs_gnu_make
 
 cat >> configure.in << 'END'
 AC_PROG_CC

diff --git a/tests/make.test b/tests/make.test
index 0ad6fe37ef6addcc611b5d6e9f3730c118d148f9..cd2e70069844e4e2fea725196bc42dde07cff4db 100755 (executable)
--- a/tests/make.test
+++ b/tests/make.test
@@ -15,6 +15,7 @@ END
 : > Makefile.am
 
 $needs_autoconf
+$needs_gnu_make
 
 set -e
 

diff --git a/tests/target-cflags.test b/tests/target-cflags.test
index 8f4d672675d065cd4fcbc020e902108f41638453..06643b8204fa624eecba7be2b5352dbcd44b55bc 100755 (executable)
--- a/tests/target-cflags.test
+++ b/tests/target-cflags.test
@@ -43,8 +43,7 @@ $needs_autoconf
 # Likewise for gcc.
 (gcc -v) > /dev/null 2>&1 || exit 77
 
-# Likewise for GNU make.
-($MAKE --version) > /dev/null 2>&1 || exit 77
+$needs_gnu_make
 
 set -e