diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-12-27 16:40:58 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-12-27 16:40:58 -0800 |
| commit | 1d7701a4fdb6272c6a64caad6f41c9e41b9a7916 (patch) | |
| tree | 320b90ffe88404c87a2fc7d7d8f8160f9bb75244 | |
| parent | e9dc713d18e425597339d6e2ed4a5fb2924d205d (diff) | |
| download | emacs-1d7701a4fdb6272c6a64caad6f41c9e41b9a7916.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 11 |
2 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 359adf7ac16..4cc1cd042cf 100644 --- 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 f0659457a79..6c08c7c7308 100644 --- 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 |