[Libreoffice-commits] core.git: configure.ac

[Libreoffice Gerrit user]

 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0295ff316336f50a2db04c1e295368ff4d99abe8
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Sep 12 11:32:46 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Sep 12 13:31:55 2018 +0200

    Use only exact --with-macosx-sdk=..., if explicitly requested
    
    Change-Id: Ifacf22dd283d2d90d68cfe9edc45f8f5e24f08bf
    Reviewed-on: https://gerrit.libreoffice.org/60374
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/configure.ac b/configure.ac
index 685408e99062..e46ef61e61db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2713,7 +2713,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.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}"
@@ -2727,7 +2727,7 @@ if test $_os = Darwin -o $_os = iOS; then
         fi
     done
     if test ! -d "$MACOSX_SDK_PATH"; then
-        AC_MSG_ERROR([Could not figure out the location of a Mac OS X SDK and its version])
+        AC_MSG_ERROR([Could not find an appropriate Mac OS X SDK])
     fi
 
     if test $_os = iOS; then