From ba60cd8391c1db082e4452ed58bfe6d68a9be165 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 15 May 2001 18:04:56 +0000 Subject: [PATCH] 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. --- ChangeLog | 8 ++++++++ tests/defs | 6 ++++++ tests/exsource.test | 6 +----- tests/make.test | 1 + tests/target-cflags.test | 3 +-- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d74b9e..3a0b36c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-05-15 Tom Tromey + + 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 * lib/ylwrap: Fixed quoting on regular expression. Fixes diff --git a/tests/defs b/tests/defs index 500aedb..1747178 100644 --- 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 0bd9aaa..19d4054 100755 --- 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 0ad6fe3..cd2e700 100755 --- 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 8f4d672..06643b8 100755 --- 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 -- 2.7.4