svn commit: samba r22614 - in branches/SAMBA_3_0/source: .

[jpeach at samba.org]

Author: jpeach
Date: 2007-04-30 18:59:34 +0000 (Mon, 30 Apr 2007)
New Revision: 22614

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22614

Log:
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".

Modified:
   branches/SAMBA_3_0/source/configure.in


Changeset:
Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in	2007-04-30 17:19:49 UTC (rev 22613)
+++ branches/SAMBA_3_0/source/configure.in	2007-04-30 18:59:34 UTC (rev 22614)
@@ -602,10 +602,16 @@
 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()