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.

diff --git a/configure b/configure
index c13aae069399fef2553da1d10f81059b21283887..983f68c49c957a6887d1729356f538a8582febb9 100755 (executable)
--- 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 a497ac8a97c34dc55e8b8cf23c1b2a66feb5d5f2..d05e1bcf512786c0074f14d64df8b4ee90e296a9 100644 (file)
--- 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