[Libreoffice-commits] .: configure.in

Joseph Powers jpowers at kemper.freedesktop.org
Tue Jul 26 20:13:47 PDT 2011


 configure.in |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9e0d2f8f8cb0385e803441591f1a5e16fd9f95a2
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Tue Jul 26 20:13:32 2011 -0700

    LIBXML & LIBXSLT should point to the correct SDK (Mac OS X)
    
    Also, the 10.7 SDK is named 10.7 and not 10.6. (copy/paste issue)

diff --git a/configure.in b/configure.in
index e5632cd..a67a614 100755
--- a/configure.in
+++ b/configure.in
@@ -1735,8 +1735,8 @@ if test "$_os" = "Darwin" ; then
         echo "Building with a SDK > 10.4 is experimental" >> warn
         ;;
     10.7)
-        MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.6.sdk"
-        macosx_sdk_value="1060"
+        MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.7.sdk"
+        macosx_sdk_value="1070"
         AC_MSG_WARN([Building with a SDK > 10.4 is experimental])
         echo "Building with a SDK > 10.4 is experimental" >> warn
         ;;
@@ -4443,7 +4443,7 @@ if test -n "$with_system_libxslt" -o -n "$with_system_libs" -o \
     SYSTEM_LIBXSLT=YES
     if test "$_os" = "Darwin"; then
         dnl make sure to use SDK path
-        LIBXSLT_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/usr/include/libxml2"
+        LIBXSLT_CFLAGS="-I$MACOSX_SDK_PATH/usr/include/libxml2"
         dnl omit -L/usr/lib
         LIBXSLT_LIBS="-lxslt -lxml2 -lz -lpthread -liconv -lm"
     else
@@ -4483,7 +4483,7 @@ if test -n "$with_system_libxml" -o -n "$with_system_libs" -o \
     SYSTEM_LIBXML=YES
     if test "$_os" = "Darwin"; then
         dnl make sure to use SDK path
-        LIBXML_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/usr/include/libxml2"
+        LIBXML_CFLAGS="-I$MACOSX_SDK_PATH/usr/include/libxml2"
         dnl omit -L/usr/lib
         LIBXML_LIBS="-lxml2 -lz -lpthread -liconv -lm"
     elif test $_os = iOS; then


More information about the Libreoffice-commits mailing list