From 693c9340e5726cf4612f70ecdcc470d9c32cd9f1 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Mon, 10 May 2004 20:38:37 +0000 Subject: [PATCH] * tests/defs.in (GNUmake): Grep for GNU to parry FreeBSD make. Report from Mark D. Baushke. --- ChangeLog | 5 +++++ THANKS | 1 + tests/defs.in | 8 +++++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8828d17fc..b552b017c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-05-10 Alexandre Duret-Lutz + + * tests/defs.in (GNUmake): Grep for GNU to parry FreeBSD make. + Report from Mark D. Baushke. + 2004-04-25 Alexandre Duret-Lutz * lib/texinfo.tex: New upstream version. diff --git a/THANKS b/THANKS index a6c02c1e6..bd427043d 100644 --- a/THANKS +++ b/THANKS @@ -139,6 +139,7 @@ Manu Rouat emmanuel.rouat@wanadoo.fr Marcus Brinkmann Marcus.Brinkmann@ruhr-uni-bochum.de Marcus G. Daniels mgd@ute.santafe.edu Marius Vollmer mvo@zagadka.ping.de +Mark D. Baushke mdb@cvshome.org Mark Eichin eichin@cygnus.com Mark Elbrecht snowball3@bigfoot.com Mark Galassi rosalia@nis.lanl.gov diff --git a/tests/defs.in b/tests/defs.in index 5fdf1c195..b7b23ac63 100644 --- a/tests/defs.in +++ b/tests/defs.in @@ -113,9 +113,11 @@ then ( etags --version -o /dev/null ) || exit 77 ;; GNUmake) - # Use --version and -v, because SGI Make doesn't fail on --version. - echo "$me: running $MAKE --version -v" - ( $MAKE --version -v ) || exit 77 + # Use --version AND -v, because SGI Make doesn't fail on --version. + # Also grep for GNU because newer versions of FreeBSD make do + # not complain about `--version' (they seem to silently ignore it). + echo "$me: running $MAKE --version -v | grep GNU" + ( $MAKE --version -v | grep GNU ) || exit 77 ;; gcc) # When gcc is required, export `CC=gcc' so that ./configure -- 2.47.2