diff options
author | Tor Lillqvist <tml@collabora.com> | 2015-06-09 00:33:38 +0300 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-10-02 14:58:37 +0200 |
commit | 5d096341f7318c69eb557dcfcf4f95e0b4b77463 (patch) | |
tree | fe75f896bef71ce30a134acc3f38bfae56821886 /configure.ac | |
parent | 6d82539be0f72aa4308aad5c31cc6f6b66e73134 (diff) |
accept OS X 10.11 in configure, and fix firebird build against it
Accept also OS X 10.11
Change-Id: Ieedf4810f1e726bf11f0d0b1a203e560a0b16550
(cherry picked from commit bcd52844597640504d3a7caf5441f9f6181497c5)
Fix Firebird build against OS X SDK 10.11
Change-Id: I60c7540241c41f5063736f2a3d4817371411c8dc
(cherry picked from commit a799d7c9a66464f33bd8ee42d535e29a976d64ae)
Reviewed-on: https://gerrit.libreoffice.org/18718
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index f2a7271cd124..0d0e9969ca4e 100644 --- a/configure.ac +++ b/configure.ac @@ -2737,7 +2737,7 @@ if test $_os = Darwin; then AC_MSG_CHECKING([what Mac OS X SDK to use]) - for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10; do + for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10 10.11; 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}" @@ -2765,8 +2765,11 @@ if test $_os = Darwin; then 10.10) MACOSX_SDK_VERSION=101000 ;; + 10.11) + MACOSX_SDK_VERSION=101100 + ;; *) - AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.8--10]) + AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.8--11]) ;; esac @@ -2795,8 +2798,11 @@ if test $_os = Darwin; then 10.10) MAC_OS_X_VERSION_MIN_REQUIRED="101000" ;; + 10.11) + MAC_OS_X_VERSION_MIN_REQUIRED="101100" + ;; *) - AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.8--10]) + AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.8--11]) ;; esac @@ -2829,8 +2835,11 @@ if test $_os = Darwin; then 10.10) MAC_OS_X_VERSION_MAX_ALLOWED="101000" ;; + 10.11) + MAC_OS_X_VERSION_MAX_ALLOWED="101100" + ;; *) - AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.8--10]) + AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.8--11]) ;; esac |