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

[Tor Lillqvist (via logerrit)]

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

New commits:
commit 035073ec91e54c3e2d3eaf4223169e89aabc81fa
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Apr 27 11:38:38 2021 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Apr 28 14:02:19 2021 +0200

    Accept macOS SDK 11.3
    
    Change-Id: I210ae30e51d796990f88340da8b29f4c7080f5d2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114702
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114787
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/configure.ac b/configure.ac
index c894b7331623..472d0df7ecc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3130,7 +3130,7 @@ if test $_os = Darwin; then
     # higher than or equal to the minimum required should be found.
 
     AC_MSG_CHECKING([what macOS SDK to use])
-    for _macosx_sdk in ${with_macosx_sdk-11.1 11.0 10.15 10.14 10.13}; do
+    for _macosx_sdk in ${with_macosx_sdk-11.3 11.1 11.0 10.15 10.14 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}"
@@ -3165,8 +3165,11 @@ if test $_os = Darwin; then
     11.1)
         MACOSX_SDK_VERSION=110100
         ;;
+    11.3)
+        MACOSX_SDK_VERSION=110300
+        ;;
     *)
-        AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.13--11.1])
+        AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.13--11.3])
         ;;
     esac
 
@@ -3231,8 +3234,11 @@ if test $_os = Darwin; then
     11.1)
         MAC_OS_X_VERSION_MIN_REQUIRED="110100"
         ;;
+    11.3)
+        MAC_OS_X_VERSION_MIN_REQUIRED="110300"
+        ;;
     *)
-        AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.10--11.1])
+        AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.10--11.3])
         ;;
     esac
 
@@ -3296,8 +3302,11 @@ if test $_os = Darwin; then
     11.1)
         MAC_OS_X_VERSION_MAX_ALLOWED="110100"
         ;;
+    11.3)
+        MAC_OS_X_VERSION_MAX_ALLOWED="110300"
+        ;;
     *)
-        AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.10--11.1])
+        AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.10--11.3])
         ;;
     esac