configure.ac | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
New commits: commit 1d9205e7093b367d95521016c0aba4a246ac818d Author: Tor Lillqvist <[email protected]> AuthorDate: Mon Mar 14 23:43:35 2022 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Apr 1 22:42:52 2022 +0200 Accept macOS SDK 12.3 Change-Id: Ice469236dd79675b6fad6f7c5a244888200fea8b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131565 Tested-by: Tor Lillqvist <[email protected]> Reviewed-by: Tor Lillqvist <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131975 Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132436 diff --git a/configure.ac b/configure.ac index a8802eb6eb78..1bb6ea0a1af9 100644 --- a/configure.ac +++ b/configure.ac @@ -3225,7 +3225,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-12.1 12.0 11.3 11.1 11.0 10.15 10.14 10.13}; do + for _macosx_sdk in ${with_macosx_sdk-12.3 12.1 12.0 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}" @@ -3269,6 +3269,9 @@ if test $_os = Darwin; then 12.1) MACOSX_SDK_VERSION=120100 ;; + 12.3) + MACOSX_SDK_VERSION=120300 + ;; *) AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.13--12.1]) ;; @@ -3344,8 +3347,11 @@ if test $_os = Darwin; then 12.1) MAC_OS_X_VERSION_MIN_REQUIRED="120100" ;; + 12.3) + MAC_OS_X_VERSION_MIN_REQUIRED="120300" + ;; *) - AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.10--12.1]) + AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.10--12.3]) ;; esac @@ -3418,8 +3424,11 @@ if test $_os = Darwin; then 12.1) MAC_OS_X_VERSION_MAX_ALLOWED="120100" ;; + 12.3) + MAC_OS_X_VERSION_MAX_ALLOWED="120300" + ;; *) - AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.10--12.1]) + AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.10--12.3]) ;; esac
