Commit 1d7701a4 authored by Paul Eggert's avatar Paul Eggert

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
parent e9dc713d
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> 2013-12-27 Paul Eggert <eggert@cs.ucla.edu>
Port xcrun configuration to GNU/Linux. Port xcrun configuration to GNU/Linux.
......
...@@ -85,8 +85,15 @@ AC_CONFIG_AUX_DIR(build-aux) ...@@ -85,8 +85,15 @@ AC_CONFIG_AUX_DIR(build-aux)
xcsdkdir= xcsdkdir=
AC_CHECK_PROGS(XCRUN, [xcrun]) AC_CHECK_PROGS(XCRUN, [xcrun])
if test -n "$XCRUN"; then if test -n "$XCRUN"; then
AC_CHECK_PROGS(MAKE, [make "$XCRUN make"]) if test -z "$MAKE"; then
test -n "$MAKE" && export MAKE 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` xcsdkdir=`$XCRUN --show-sdk-path 2>/dev/null`
fi fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment