From: James Peach <jpeach@samba.org>
Date: Mon, 30 Apr 2007 18:59:34 +0000 (+0000)
Subject: r22614: Only enable GNU-isms in the Makefile if we can be sure that the GNU
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~571
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e3802961c1895f260f04a7955a2a182d657248a0;p=thirdparty%2Fsamba.git

r22614: Only enable GNU-isms in the Makefile if we can be sure that the GNU
make we found is what will be run when the user invokes "make".
---

diff --git a/source/configure.in b/source/configure.in
index 457e3c107ca..358b233f00f 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -602,10 +602,16 @@ m4_include(m4/check_gnu_make.m4)
 m4_include(m4/depend.m4)
 
 # Using the dependency files requires GNU make until someone adds support
-# for Makefile includes for other make implementations.
+# for Makefile includes for other make implementations. Note that
+# CHECK_GNU_MAKE() can find a non-default make.
 CHECK_GNU_MAKE()
-if test "x$_cv_gnu_make_command" != "x" ; then
+if test "x$_cv_gnu_make_command" != "x" -a \
+    x`which make` = x`which "$_cv_gnu_make_command"` ; then
     AC_SUBST(MAKE, $_cv_gnu_make_command)
+else
+    # If GNU make is not the default, don't enable GNU-isms because we can't
+    # guarantee that GNU make will actually be the make that is invoked.
+    ifGNUmake='#'
 fi
 
 AM_DEP_TRACK()