diff options
| author | Bruno Haible <bruno@clisp.org> | 2018-10-30 12:56:42 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2018-10-30 12:58:22 +0100 |
| commit | 28098428d3d371a238837f338739283cf19dc650 (patch) | |
| tree | f253eda8d1d9e56f33940985cc98440bdc92665a | |
| parent | c58eb574c3a2cb76113ad4d9afea19ab5562f292 (diff) | |
| download | gnulib-28098428d3d371a238837f338739283cf19dc650.tar.gz | |
gnu-make: Fix for NetBSD 8 'make'.
Reported by Reuben Thomas in
<https://lists.gnu.org/archive/html/bug-gnulib/2018-10/msg00135.html>.
* m4/gnu-make.m4 (gl_GNU_MAKE): Use a heuristic based on the --version
output, ignoring exit codes.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | m4/gnu-make.m4 | 4 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2018-10-30 Bruno Haible <bruno@clisp.org> + + gnu-make: Fix for NetBSD 8 'make'. + Reported by Reuben Thomas in + <https://lists.gnu.org/archive/html/bug-gnulib/2018-10/msg00135.html>. + * m4/gnu-make.m4 (gl_GNU_MAKE): Use a heuristic based on the --version + output, ignoring exit codes. + 2018-10-28 Bernhard Voelker <mail@bernhard-voelker.de> maintainer-makefile: fix syntax-check rule for "same.h" diff --git a/m4/gnu-make.m4 b/m4/gnu-make.m4 index 1f833d96bc..507dad6ec8 100644 --- a/m4/gnu-make.m4 +++ b/m4/gnu-make.m4 @@ -10,10 +10,8 @@ # Set GNU_MAKE if we are using a recent-enough version of GNU make. -# Use --version AND trailing junk, because SGI Make doesn't fail on --version. - AC_DEFUN([gl_GNU_MAKE], [ AM_CONDITIONAL([GNU_MAKE], - [${MAKE-make} --version /cannot/make/this >/dev/null 2>&1]) + [LC_ALL=C ${MAKE-make} --version 2>/dev/null | sed -e '2,$d' | grep GNU >/dev/null]) ]) |