diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-04-15 14:08:10 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-04-15 15:24:37 +0200 |
| commit | 336b27890b10f346158491b0d5d8edc25fb476e4 (patch) | |
| tree | 31137f8cf1fac44fa55657975306d1d88ec9bf24 | |
| parent | f649237f0adeb0d01e8a6a4d87ea85250be80ce9 (diff) | |
Look for the Mac OS X SDKs also where current Xcode has them
| -rw-r--r-- | configure.in | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/configure.in b/configure.in index d674d3442c08..bac686636475 100644 --- a/configure.in +++ b/configure.in @@ -2317,20 +2317,20 @@ 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" + MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.4u.sdk" fi if test ! -d "$MACOSX_SDK_PATH"; then - MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.4u.sdk" + MACOSX_SDK_PATH="/Xcode3/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" + MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.5.sdk" fi if test ! -d "$MACOSX_SDK_PATH"; then - MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.5.sdk" + MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.5.sdk" fi macosx_sdk_value="1050" AC_MSG_WARN([Building with a SDK > 10.4 is experimental]) @@ -2338,12 +2338,18 @@ if test "$_os" = "Darwin"; then ;; 10.6) 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" AC_MSG_WARN([Building with a SDK > 10.4 is experimental]) echo "Building with a SDK > 10.4 is experimental" >> warn ;; 10.7) 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" 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 |