[Libreoffice-commits] .: configure.in

Joseph Powers jpowers at kemper.freedesktop.org
Thu Jul 28 22:20:39 PDT 2011


 configure.in |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit be37e3c0ef324875476e3314b89cff357bf8d395
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Thu Jul 28 22:20:09 2011 -0700

    Mac OS 10.7: Installing xCode 4.1 renames 3.6.2 to /Developer-old
    
    xCode 4.1 only ships with SDKs 10.6 & 10.7; thus, if the request 10.4 or
    10.5 doesn't exists, try looking in /Developer-old.

diff --git a/configure.in b/configure.in
index 7b97134..f54b1e9 100755
--- a/configure.in
+++ b/configure.in
@@ -1740,10 +1740,16 @@ if test "$_os" = "Darwin" ; then
 
     10.4)
         MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.4u.sdk"
+        if ! [ test -d "$MACOSX_SDK_PATH" ]; then
+          MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.4u.sdk"
+        fi
         macosx_sdk_value="1040"
         ;;
     10.5)
         MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.5.sdk"
+        if ! [ test -d "$MACOSX_SDK_PATH" ] ; then
+          MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.5.sdk"
+        fi
         macosx_sdk_value="1050"
         AC_MSG_WARN([Building with a SDK > 10.4 is experimental])
         echo "Building with a SDK > 10.4 is experimental" >> warn


More information about the Libreoffice-commits mailing list