mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept also macOS SDK 10.12

Browse Source 
Change-Id: I2e654de8af40486ef63146ad42a3f2988f9c3579
This commit is contained in:
Tor Lillqvist
2016-08-04 22:48:22 +03:00
parent 124eec6779
commit 4c94b91718
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
configure.ac
View File

@@ -2842,7 +2842,7 @@ if test $_os = Darwin; then
AC_MSG_CHECKING([what Mac OS X SDK to use]) AC_MSG_CHECKING([what Mac OS X SDK to use])
for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10 10.11; do for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10 10.11 10.12; do
MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2> /dev/null` MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2> /dev/null`
if test -d "$MACOSX_SDK_PATH"; then if test -d "$MACOSX_SDK_PATH"; then
with_macosx_sdk="${_macosx_sdk}" with_macosx_sdk="${_macosx_sdk}"
@@ -2873,8 +2873,11 @@ if test $_os = Darwin; then
10.11) 10.11)
MACOSX_SDK_VERSION=101100 MACOSX_SDK_VERSION=101100
;; ;;
10.12)
MACOSX_SDK_VERSION=101200
;;
*) *)
AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.8--11]) AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.8--12])
;; ;;
esac esac
@@ -2906,8 +2909,11 @@ if test $_os = Darwin; then
10.11) 10.11)
MAC_OS_X_VERSION_MIN_REQUIRED="101100" MAC_OS_X_VERSION_MIN_REQUIRED="101100"
;; ;;
10.12)
MAC_OS_X_VERSION_MIN_REQUIRED="101200"
;;
*) *)
AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.8--11]) AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.8--12])
;; ;;
esac esac
@@ -2943,8 +2949,11 @@ if test $_os = Darwin; then
10.11) 10.11)
MAC_OS_X_VERSION_MAX_ALLOWED="101100" MAC_OS_X_VERSION_MAX_ALLOWED="101100"
;; ;;
10.12)
MAC_OS_X_VERSION_MAX_ALLOWED="101200"
;;
*) *)
AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.8--11]) AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.8--12])
;; ;;
esac esac