configure.ac | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 8c27cd8913035dc781295452946bf600a2848512
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Tue Nov 20 09:56:51 2018 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Nov 21 11:00:29 2018 +0100
Accept also macOS SDK 10.14
Change-Id: I3ff9381e547d40f9155d5324f9178939f9d7dac6
Reviewed-on: https://gerrit.libreoffice.org/63626
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/configure.ac b/configure.ac
index dd0fd29c0753..a158e7f80bcf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2702,7 +2702,7 @@ if test $_os = Darwin -o $_os = iOS; 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.13 10.12; do
+ for _macosx_sdk in $with_macosx_sdk 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}"
@@ -2746,6 +2746,9 @@ if test $_os = Darwin -o $_os = iOS; then
10.13)
MACOSX_SDK_VERSION=101300
;;
+ 10.14)
+ MACOSX_SDK_VERSION=101400
+ ;;
*)
AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported
value, supported values are 10.9--13])
;;
@@ -2782,6 +2785,9 @@ if test $_os = Darwin -o $_os = iOS; then
10.13)
MAC_OS_X_VERSION_MIN_REQUIRED="101300"
;;
+ 10.14)
+ MAC_OS_X_VERSION_MIN_REQUIRED="101400"
+ ;;
*)
AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.9--13])
;;
@@ -2823,6 +2829,9 @@ if test $_os = Darwin -o $_os = iOS; then
10.13)
MAC_OS_X_VERSION_MAX_ALLOWED="101300"
;;
+ 10.14)
+ MAC_OS_X_VERSION_MAX_ALLOWED="101400"
+ ;;
*)
AC_MSG_ERROR([with-macosx-version-max-allowed
$with_macosx_version_max_allowed is not a supported value, supported values are
10.9--13])
;;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
