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 ef2772ee6d2de7113bc420d9a6838278936750fb..3fb44fefe9390584a19236e7d27505031c1049e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2001-05-16  Tom Tromey  <tromey@redhat.com>
 
+       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 a1b9377a1e8c3a35d92614331aa3dde23d44e9d6..392e1d5f278a03f55ba26c1ba1ca8fcd45f675a2 100644 (file)
--- 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 302304dd4dc148b97c51b3fae51a5c2313172762..2232fcbffd1cb06450137f329684b57c3e834a76 100644 (file)
--- 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 78ef0fc4ffe01d7b7f4d1ce5e1565cc3d7177070..96a208700bb8705faaa2d884e99fd93902f16524 100644 (file)
--- 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 \