From: Tom Tromey Date: Thu, 17 May 2001 04:50:52 +0000 (+0000) Subject: Fix for PR automake/175: X-Git-Tag: Release-1-4f~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80f30342230b88a9883d03cb7bf5679e05c01424;p=thirdparty%2Fautomake.git Fix for PR automake/175: * tests/Makefile.am (XFAIL_TESTS): Removed make.test. * m4/make.m4 (AM_MAKE_INCLUDE): Omit `Entering directory' and `Leaving directory' messages. --- diff --git a/ChangeLog b/ChangeLog index ef2772ee6..3fb44fefe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2001-05-16 Tom Tromey + Fix for PR automake/175: + * tests/Makefile.am (XFAIL_TESTS): Removed make.test. + * m4/make.m4 (AM_MAKE_INCLUDE): Omit `Entering directory' and + `Leaving directory' messages. + For PR automake/175: * tests/Makefile.am (XFAIL_TESTS): Added make.test. * tests/make.test: Run test with `make -w'. diff --git a/m4/make.m4 b/m4/make.m4 index a1b9377a1..392e1d5f2 100644 --- a/m4/make.m4 +++ b/m4/make.m4 @@ -14,7 +14,12 @@ _am_quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# be invoked under some other name (usually "gmake"), in which +# case it prints its new name instead of `make'. +if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then _am_include=include _am_quote= _am_result=GNU diff --git a/tests/Makefile.am b/tests/Makefile.am index 302304dd4..2232fcbff 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = gnits -XFAIL_TESTS = subdir5.test make.test +XFAIL_TESTS = subdir5.test TESTS = \ acinclude.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 78ef0fc4f..96a208700 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -70,7 +70,7 @@ install_sh = @install_sh@ AUTOMAKE_OPTIONS = gnits -XFAIL_TESTS = subdir5.test make.test +XFAIL_TESTS = subdir5.test TESTS = \ acinclude.test \