From 6d120be7b88a50bcbede288e08ebfc9f42d24ec9 Mon Sep 17 00:00:00 2001 From: David Elliott Date: Mon, 3 Sep 2007 18:12:28 +0000 Subject: [PATCH] Merged 48530 from trunk: Try the DefaultProperties key if the buildSettings key doesn't work when reading the SDKSettings.plist. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@48531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 11 +++++++++-- configure.in | 7 +++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 4e64483648..4b8b44c19d 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Id: configure.in 48442 2007-08-28 23:32:41Z RD . +# From configure.in Id: configure.in 48460 2007-08-30 13:34:07Z CE . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.4. +# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.5. # # Report bugs to . # @@ -15666,6 +15666,13 @@ echo $ECHO_N "checking SDK deployment version... $ECHO_C" >&6 MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'` + # If that failed, try again with the new key + if test "x$MACOSX_SDK_PLIST_VERSION_MIN" == "x"; then + + MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'` + + fi + if test "x$MACOSX_SDK_PLIST_VERSION_MIN" != "x"; then wxUSE_MACOSX_VERSION_MIN=$MACOSX_SDK_PLIST_VERSION_MIN echo "$as_me:$LINENO: result: $wxUSE_MACOSX_VERSION_MIN" >&5 diff --git a/configure.in b/configure.in index 4bd827d835..6bc020074b 100644 --- a/configure.in +++ b/configure.in @@ -1642,6 +1642,13 @@ dnl We need to quote the next line where we don't need macros and do need [] in [ MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'` ] + # If that failed, try again with the new key + if test "x$MACOSX_SDK_PLIST_VERSION_MIN" == "x"; then +[ + MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'` +] + fi + if test "x$MACOSX_SDK_PLIST_VERSION_MIN" != "x"; then wxUSE_MACOSX_VERSION_MIN=$MACOSX_SDK_PLIST_VERSION_MIN AC_MSG_RESULT([$wxUSE_MACOSX_VERSION_MIN])