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

[Tor Lillqvist]

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

New commits:
commit ef9ac6e14cf2a5446136c2d4b3daf28418f56351
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Sep 19 22:06:10 2017 +0300

    Accept macOS 10.13
    
    Change-Id: I9dfc9e8ec6906e0fee4314410d970e02c881e94d
    Reviewed-on: https://gerrit.libreoffice.org/42792
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/configure.ac b/configure.ac
index c71d8bc8fd18..c468ab8f5307 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2740,7 +2740,7 @@ if test $_os = Darwin; then
 
     AC_MSG_CHECKING([what Mac OS X SDK to use])
 
-    for _macosx_sdk in $with_macosx_sdk 10.9 10.10 10.11 10.12; do
+    for _macosx_sdk in $with_macosx_sdk 10.9 10.10 10.11 10.12 10.13; 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}"
@@ -2771,8 +2771,11 @@ if test $_os = Darwin; then
     10.12)
         MACOSX_SDK_VERSION=101200
         ;;
+    10.13)
+        MACOSX_SDK_VERSION=101300
+        ;;
     *)
-        AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.9--12])
+        AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.9--13])
         ;;
     esac
 
@@ -2804,8 +2807,11 @@ if test $_os = Darwin; then
     10.12)
         MAC_OS_X_VERSION_MIN_REQUIRED="101200"
         ;;
+    10.13)
+        MAC_OS_X_VERSION_MIN_REQUIRED="101300"
+        ;;
     *)
-        AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.9--12])
+        AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.9--13])
         ;;
     esac
 
@@ -2841,8 +2847,11 @@ if test $_os = Darwin; then
     10.12)
         MAC_OS_X_VERSION_MAX_ALLOWED="101200"
         ;;
+    10.13)
+        MAC_OS_X_VERSION_MAX_ALLOWED="101300"
+        ;;
     *)
-        AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.9--12])
+        AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.9--13])
         ;;
     esac