summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2019-06-04 23:36:47 +0300
committerTor Lillqvist <tml@collabora.com>2019-06-05 07:44:55 +0300
commit4378eae8aa5f29d02ac02000ba0d3a769b27c18e (patch)
treec97ee66cef566c5f33af89c4122b5aac5140a48f /configure.ac
parentc30ea50dd2b1c557dfbefc1a4c660fbf2402a604 (diff)
Accept also macOS SDK 10.15
Change-Id: I2369db6b76af67d71146903c081ce6427d45c211
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac17
1 files changed, 13 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 7f98a4a429b5..f03615124aa4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2735,7 +2735,7 @@ if test $_os = Darwin -o $_os = iOS; 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-10.14 10.13 10.12}; do
+ for _macosx_sdk in ${with_macosx_sdk-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}"
@@ -2773,8 +2773,11 @@ if test $_os = Darwin -o $_os = iOS; then
10.14)
MACOSX_SDK_VERSION=101400
;;
+ 10.15)
+ MACOSX_SDK_VERSION=101500
+ ;;
*)
- AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.12--14])
+ AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.12--15])
;;
esac
@@ -2819,8 +2822,11 @@ if test $_os = Darwin -o $_os = iOS; then
10.14)
MAC_OS_X_VERSION_MIN_REQUIRED="101400"
;;
+ 10.15)
+ MAC_OS_X_VERSION_MIN_REQUIRED="101500"
+ ;;
*)
- AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.10--14])
+ AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.10--15])
;;
esac
MAC_OS_X_VERSION_MIN_REQUIRED_DOTS=$with_macosx_version_min_required
@@ -2860,8 +2866,11 @@ if test $_os = Darwin -o $_os = iOS; then
10.14)
MAC_OS_X_VERSION_MAX_ALLOWED="101400"
;;
+ 10.15)
+ MAC_OS_X_VERSION_MAX_ALLOWED="101500"
+ ;;
*)
- AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.10--14])
+ AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.10--15])
;;
esac