[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115771: * configure.ac: Detect xcrun on OSX and use
From: |
Jan D. |
Subject: |
[Emacs-diffs] trunk r115771: * configure.ac: Detect xcrun on OSX and use it for make, gcc and libxml. |
Date: |
Fri, 27 Dec 2013 16:57:57 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115771
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Fri 2013-12-27 17:57:52 +0100
message:
* configure.ac: Detect xcrun on OSX and use it for make, gcc and libxml.
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
configure.ac
configure.in-20091113204419-o5vbwnq5f7feedwu-783
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-12-26 08:57:28 +0000
+++ b/ChangeLog 2013-12-27 16:57:52 +0000
@@ -1,3 +1,8 @@
+2013-12-27 Jan Djärv <address@hidden>
+
+ * configure.ac: Detect xcrun on OSX and use it for make, gcc and
+ libxml.
+
2013-12-26 Paul Eggert <address@hidden>
Fix core dumps with gcc -fsanitize=address and GNU/Linux.
=== modified file 'configure.ac'
--- a/configure.ac 2013-12-26 08:57:28 +0000
+++ b/configure.ac 2013-12-27 16:57:52 +0000
@@ -39,6 +39,18 @@
esac
fi
+case "`uname 2>/dev/null`" in
+ *Darwin*)
+ xcsdkdir=
+ AC_CHECK_PROGS(XCRUN, [xcrun])
+ if test x"$XCRUN" != x; then
+ AC_CHECK_PROGS(MAKE, [make "$XCRUN make"])
+ export MAKE
+ xcsdkdir="`$XCRUN --show-sdk-path 2>/dev/null`"
+ fi
+ ;;
+esac
+
dnl Set emacs_config_options to the options of 'configure', quoted for the
shell,
dnl and then quoted again for a C string. Separate options with spaces.
dnl Add some environment variables, if they were passed via the environment
@@ -638,7 +650,13 @@
#### Choose a compiler.
dnl Sets GCC=yes if using gcc.
-AC_PROG_CC
+if test x$opsys = xdarwin && test x"$XCRUN" != x; then
+ AC_PROG_CC([gcc cc cl clang "$XCRUN gcc" "$XCRUN clang"])
+ AC_CHECK_PROGS(AR, [ar "$XCRUN ar"])
+ test x"$AR" != x && export AR
+else
+ AC_PROG_CC
+fi
AM_PROG_CC_C_O
if test x$GCC = xyes; then
@@ -3275,14 +3293,14 @@
# Built-in libxml2 on OS X 10.8 lacks libxml-2.0.pc.
if test "${HAVE_LIBXML2}" != "yes" -a "$opsys" = "darwin"; then
SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -I/usr/include/libxml2"
+ CPPFLAGS="$CPPFLAGS -I$xcsdkdir/usr/include/libxml2"
AC_CHECK_HEADER(libxml/HTMLparser.h,
[AC_CHECK_DECL(HTML_PARSE_RECOVER, HAVE_LIBXML2=yes, ,
[#include <libxml/HTMLparser.h>])])
CPPFLAGS="$SAVE_CPPFLAGS"
if test "${HAVE_LIBXML2}" = "yes"; then
+ LIBXML2_CFLAGS="-I'$xcsdkdir/usr/include/libxml2'"
LIBXML2_LIBS="-lxml2"
- LIBXML2_CFLAGS="-I/usr/include/libxml2"
fi
fi
if test "${HAVE_LIBXML2}" = "yes"; then
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115771: * configure.ac: Detect xcrun on OSX and use it for make, gcc and libxml.,
Jan D. <=