mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Look for the Mac OS X SDKs also where current Xcode has them

Browse Source
This commit is contained in:
Tor Lillqvist
2012-04-15 14:08:10 +02:00
parent f649237f0a
commit 336b27890b
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
configure.in
View File

@@ -2317,20 +2317,20 @@ if test "$_os" = "Darwin"; then
10.4) 10.4)
MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.4u.sdk" MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.4u.sdk"
if test ! -d "$MACOSX_SDK_PATH"; then if test ! -d "$MACOSX_SDK_PATH"; then
MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.4u.sdk" MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.4u.sdk"
fi fi
if test ! -d "$MACOSX_SDK_PATH"; then if test ! -d "$MACOSX_SDK_PATH"; then
MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.4u.sdk" MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.4u.sdk"
fi fi
macosx_sdk_value="1040" macosx_sdk_value="1040"
;; ;;
10.5) 10.5)
MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.5.sdk" MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.5.sdk"
if test ! -d "$MACOSX_SDK_PATH"; then if test ! -d "$MACOSX_SDK_PATH"; then
MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.5.sdk" MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.5.sdk"
fi fi
if test ! -d "$MACOSX_SDK_PATH"; then if test ! -d "$MACOSX_SDK_PATH"; then
MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.5.sdk" MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.5.sdk"
fi fi
macosx_sdk_value="1050" macosx_sdk_value="1050"
AC_MSG_WARN([Building with a SDK > 10.4 is experimental]) AC_MSG_WARN([Building with a SDK > 10.4 is experimental])
@@ -2338,12 +2338,18 @@ if test "$_os" = "Darwin"; then
;; ;;
10.6) 10.6)
MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.6.sdk" MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.6.sdk"
if test ! -d "$MACOSX_SDK_PATH"; then
MACOSX_SDK_PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk
fi
macosx_sdk_value="1060" macosx_sdk_value="1060"
AC_MSG_WARN([Building with a SDK > 10.4 is experimental]) AC_MSG_WARN([Building with a SDK > 10.4 is experimental])
echo "Building with a SDK > 10.4 is experimental" >> warn echo "Building with a SDK > 10.4 is experimental" >> warn
;; ;;
10.7) 10.7)
MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.7.sdk" MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.7.sdk"
if test ! -d "$MACOSX_SDK_PATH"; then
MACOSX_SDK_PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
fi
macosx_sdk_value="1070" macosx_sdk_value="1070"
AC_MSG_WARN([Building with SDK 10.7 is known to fail in vcl]) AC_MSG_WARN([Building with SDK 10.7 is known to fail in vcl])
echo "Building with SDK 10.7 is known to fail in vcl" >> warn echo "Building with SDK 10.7 is known to fail in vcl" >> warn