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

[Tor Lillqvist (via logerrit)]

 configure.ac |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 2fb8a0c9e18801f9addb3513d6e7b4b16574bded
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Fri Apr 16 17:00:54 2021 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Apr 16 16:35:58 2021 +0200

    Accept macOS SDK 11.1
    
    Change-Id: I8bd48e8c1908b27d6e90fffb3f712762a982b575
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114210
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/configure.ac b/configure.ac
index 0e5cd92e907c..74fa63e31fe7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2750,7 +2750,7 @@ if test $_os = Darwin; then
     # higher than or equal to the minimum required should be found.
 
     AC_MSG_CHECKING([what Mac OS X SDK to use])
-    for _macosx_sdk in ${with_macosx_sdk-10.15 10.14 10.13 10.12}; do
+    for _macosx_sdk in ${with_macosx_sdk-11.1 10.15 10.14 10.13 10.12}; 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}"
@@ -2791,8 +2791,11 @@ if test $_os = Darwin; then
     10.15)
         MACOSX_SDK_VERSION=101500
         ;;
+    11.1)
+        MACOSX_SDK_VERSION=110100
+        ;;
     *)
-        AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.12--15])
+        AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.12--11.1])
         ;;
     esac
 
@@ -2880,8 +2883,11 @@ if test $_os = Darwin; then
     10.15)
         MAC_OS_X_VERSION_MAX_ALLOWED="101500"
         ;;
+    11.1)
+        MAC_OS_X_VERSION_MAX_ALLOWED="110100"
+        ;;
     *)
-        AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.9--15])
+        AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.9--11.1])
         ;;
     esac