procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix problem with MAKE and xcrun configuration.

Browse source 
* 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
This commit is contained in:
Paul Eggert 2013-12-27 16:40:58 -08:00
parent e9dc713d18
commit 1d7701a4fd
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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.

11
configure.ac
View file

@ -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