Fix problem with MAKE and xcrun configuration.

* configure.ac: Don't set MAKE unless 'make' doesn't work.
Set it only in the environment, not in the makefile.
Problem reported by Glenn Morris in:
http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00969.html

diff --git a/ChangeLog b/ChangeLog
index 359adf7ac1654b3de5d62a74021422675e0a786f..4cc1cd042cfed6ad96bd72d7c8fdc2b48c78c82b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-12-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Fix problem with MAKE and xcrun configuration.
+       * configure.ac: Don't set MAKE unless 'make' doesn't work.
+       Set it only in the environment, not in the makefile.
+       Problem reported by Glenn Morris in:
+       http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00969.html
+
 2013-12-27  Paul Eggert  <eggert@cs.ucla.edu>
 
        Port xcrun configuration to GNU/Linux.

diff --git a/configure.ac b/configure.ac
index f0659457a79ccb35da4a3de959e6f9c3d71f7226..6c08c7c73089559a93bcfa68dc01c11e12a5e1f6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -85,8 +85,15 @@ AC_CONFIG_AUX_DIR(build-aux)
 xcsdkdir=
 AC_CHECK_PROGS(XCRUN, [xcrun])
 if test -n "$XCRUN"; then
-  AC_CHECK_PROGS(MAKE, [make "$XCRUN make"])
-  test -n "$MAKE" && export MAKE
+  if test -z "$MAKE"; then
+    dnl Call the variable MAKE_PROG, not MAKE, to avoid confusion with
+    dnl SET_MAKE and with the usual MAKE variable that 'make' itself uses.
+    AC_CHECK_PROG([MAKE_PROG], [make], [yes])
+    if test -z "$MAKE_PROG"; then
+      MAKE="$XCRUN MAKE"
+      export MAKE
+    fi
+  fi
   xcsdkdir=`$XCRUN --show-sdk-path 2>/dev/null`
 fi