diff options
| author | Tom Tromey <tromey@redhat.com> | 2001-05-17 04:50:52 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2001-05-17 04:50:52 +0000 |
| commit | 80f30342230b88a9883d03cb7bf5679e05c01424 (patch) | |
| tree | 8b3dcb63d1b45f9cb4b51d1580728ad6183ef1ec /m4/make.m4 | |
| parent | 51e79b8bafb8e232a91dec3f705ec9f70705604b (diff) | |
| download | automake-80f30342230b88a9883d03cb7bf5679e05c01424.tar.gz | |
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.
Diffstat (limited to 'm4/make.m4')
| -rw-r--r-- | m4/make.m4 | 7 |
1 files changed, 6 insertions, 1 deletions
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 |