[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac

[Tor Lillqvist]

 configure.ac |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit b2fd4bfe76c3ebc219f312d86d9759e5cb4131ac
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Dec 26 17:25:30 2013 +0200

    When using --with-macosx-sdk=10.8 or 9, use xcode-select -print-path
    
    I want to be able to use of a separate Xcode installation (like a
    developer preview) instead of the /Applications/Xcode.app one.
    
    Change-Id: I1faa84d028a8df6b4fc61b321fd2a6cde9a0ab0f

diff --git a/configure.ac b/configure.ac
index b8def00..0e112bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2706,13 +2706,9 @@ if test $_os = Darwin; then
             fi
             ;;
         10.8|10.9)
-            if test -d "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$with_macosx_sdk.sdk"; then
-                MACOSX_SDK_PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$with_macosx_sdk.sdk
-            else
-                xcodepath="`xcode-select -print-path`"
-                if test -d "$xcodepath/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$with_macosx_sdk.sdk"; then
-                    MACOSX_SDK_PATH="$xcodepath/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$with_macosx_sdk.sdk"
-                fi
+            xcodepath="`xcode-select -print-path`"
+            if test -d "$xcodepath/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$with_macosx_sdk.sdk"; then
+                MACOSX_SDK_PATH="$xcodepath/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$with_macosx_sdk.sdk"
             fi
             ;;
         esac