[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac

[Tor Lillqvist]

 configure.ac |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

New commits:
commit d61d755debafc8157a317b308c7a2d47b7fd5b4d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jun 9 00:33:38 2015 +0300

    Accept also OS X 10.11
    
    Change-Id: Ieedf4810f1e726bf11f0d0b1a203e560a0b16550

diff --git a/configure.ac b/configure.ac
index 989f386..0d9a8c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2764,7 +2764,7 @@ if test $_os = Darwin; then
 
     AC_MSG_CHECKING([what Mac OS X SDK to use])
 
-    for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10; do
+    for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10 10.11; do
         MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2> /dev/null`
         if test -d "$MACOSX_SDK_PATH"; then
             with_macosx_sdk="${_macosx_sdk}"
@@ -2792,8 +2792,11 @@ if test $_os = Darwin; then
     10.10)
         MACOSX_SDK_VERSION=101000
         ;;
+    10.11)
+        MACOSX_SDK_VERSION=101100
+        ;;
     *)
-        AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.8--10])
+        AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.8--11])
         ;;
     esac
 
@@ -2822,8 +2825,11 @@ if test $_os = Darwin; then
     10.10)
         MAC_OS_X_VERSION_MIN_REQUIRED="101000"
         ;;
+    10.11)
+        MAC_OS_X_VERSION_MIN_REQUIRED="101100"
+        ;;
     *)
-        AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.8--10])
+        AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.8--11])
         ;;
     esac
 
@@ -2856,8 +2862,11 @@ if test $_os = Darwin; then
     10.10)
         MAC_OS_X_VERSION_MAX_ALLOWED="101000"
         ;;
+    10.11)
+        MAC_OS_X_VERSION_MAX_ALLOWED="101100"
+        ;;
     *)
-        AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.8--10])
+        AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.8--11])
         ;;
     esac