From 3784ff98114039d973d49cd3fefbb9f17360553f Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Mon, 25 Jun 2012 05:04:28 -0700 Subject: [PATCH] Issue #13950: Improve support for OS X Xcode 4: Fix ./configure to provide a more sensible default for MACOSX_DEPLOYMENT_TARGET. Currently the default is the minimum OS X level that supports the universal arch option, typically 10.4, even when no universalsdk is selected. This causes various desirable features that depend on later OS X versions, like libedit readline support, to be omitted from the build. A more complete solution would take into account the SDK that is being used and better tailor the universal arch options. For now, change the existing tests to only apply to build systems of 10.5 and earlier; for 10.6 and later, use the build system version as the default deployment target if the MACOSX_DEPLOYMENT_TARGET environment variable is not provided. --- configure | 4 +++- configure.ac | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure b/configure index c13aae06939..983f68c49c9 100755 --- a/configure +++ b/configure @@ -5971,7 +5971,9 @@ $as_echo "$CC" >&6; } # Calculate the right deployment target for this build. # cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'` - if test ${cur_target} '>' 10.2; then + if test ${cur_target} '>' 10.2 && \ + test ${cur_target} '<' 10.6 + then cur_target=10.3 if test ${enable_universalsdk}; then if test "${UNIVERSAL_ARCHS}" = "all"; then diff --git a/configure.ac b/configure.ac index a497ac8a97c..d05e1bcf512 100644 --- a/configure.ac +++ b/configure.ac @@ -1177,7 +1177,9 @@ yes) # Calculate the right deployment target for this build. # cur_target=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'` - if test ${cur_target} '>' 10.2; then + if test ${cur_target} '>' 10.2 && \ + test ${cur_target} '<' 10.6 + then cur_target=10.3 if test ${enable_universalsdk}; then if test "${UNIVERSAL_ARCHS}" = "all"; then