[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Emacs-diffs] emacs-25 89e7483: * configure.ac: Find libxml2 headers
From: |
Herbert J. Skuhra |
Subject: |
Re: [Emacs-diffs] emacs-25 89e7483: * configure.ac: Find libxml2 headers in Xcode SDK dir on Darwin. |
Date: |
Thu, 31 Dec 2015 12:40:21 +0100 |
User-agent: |
Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (Gojō) APEL/10.8 EasyPG/1.0.0 Emacs/25.0.50 (i386-pc-freebsd10.2) MULE/6.0 (HANACHIRUSATO) |
On Thu, 31 Dec 2015 09:30:07 +0100,
YAMAMOTO Mitsuharu <address@hidden> wrote:
>
> >>>>> On Thu, 31 Dec 2015 09:05:50 +0100, "Herbert J. Skuhra"
> >>>>> <address@hidden> said:
>
> >> I'm using OS X 10.10.5 and 10.11.2 without command line developer
> >> tools installed on my laptop. Could you show me the output of the
> >> following commands?
> >>
> >> $ xcrun --show-sdk-path
> >> $ xcrun --sdk macosx --show-sdk-path
>
> > Both commands output
>
> > /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk
>
> These commands seem to work correctly. Do you happen to have (bogus)
> /usr/include? Usually that does not happen on OS X 10.11 because of
> the System Integrity Protection, but you can disable it.
>
> The Mac port has been using this code for one year
> (http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg01719.html),
> but I haven't received any bug reports about it. If you don't have
> /usr/include, then please send me config.log personally.
How about?
diff --git a/configure.ac b/configure.ac
index 9c783e6..d9e75e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3610,8 +3610,6 @@ AC_SUBST(XFIXES_LIBS)
### mingw32 doesn't use -lxml2, since it loads the library dynamically.
HAVE_LIBXML2=no
if test "${with_xml2}" != "no"; then
- ### I'm not sure what the version number should be, so I just guessed.
- EMACS_CHECK_MODULES([LIBXML2], [libxml-2.0 > 2.6.17])
# Built-in libxml2 on OS X 10.8 lacks libxml-2.0.pc.
if test "${HAVE_LIBXML2}" != "yes" && test "$opsys" = "darwin"; then
SAVE_CPPFLAGS="$CPPFLAGS"
@@ -3633,6 +3631,8 @@ if test "${with_xml2}" != "no"; then
LIBXML2_LIBS="-lxml2"
fi
fi
+ ### I'm not sure what the version number should be, so I just guessed.
+ EMACS_CHECK_MODULES([LIBXML2], [libxml-2.0 > 2.6.17])
if test "${HAVE_LIBXML2}" = "yes"; then
if test "${opsys}" != "mingw32"; then
AC_CHECK_LIB(xml2, htmlReadMemory, HAVE_LIBXML2=yes, HAVE_LIBXML2=no,
--
Herbert