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 457e3c107caa7b3b70d03d57a95f847b170ae6e0..358b233f00fcecb65d5a55f37e19670a75bcbac0 100644 (file)
--- 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()