[Emacs-diffs] trunk r115782: Fix problem with MAKE and xcrun configuration.

[Paul Eggert]

------------------------------------------------------------
revno: 115782
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2013-12-27 16:40:58 -0800
message:
  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
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-12-28 00:31:33 +0000
+++ b/ChangeLog 2013-12-28 00:40:58 +0000
@@ -1,3 +1,11 @@
+2013-12-28  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        Port xcrun configuration to GNU/Linux.

=== modified file 'configure.ac'
--- a/configure.ac      2013-12-27 19:14:10 +0000
+++ b/configure.ac      2013-12-28 00:40:58 +0000
@@ -85,8 +85,15 @@
 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