]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Backport of 1.479:
authorJack Jansen <jack.jansen@cwi.nl>
Fri, 7 Jan 2005 13:13:50 +0000 (13:13 +0000)
committerJack Jansen <jack.jansen@cwi.nl>
Fri, 7 Jan 2005 13:13:50 +0000 (13:13 +0000)
Always set CONFIGURE_MACOSX_DEPLOYMENT_TARGET otherwise it may be set
to an empty value and distutils will get confused lateron.

configure
configure.in

index d097ff893366e1588aca6e8f6cdb1acd4ed27715..ec0ccae72821baa87a2773708b100477c12a3922 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.475.2.2 .
+# From configure.in Revision: 1.475.2.3 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for python 2.4.
 #
@@ -10323,11 +10323,11 @@ then
                # Use -undefined dynamic_lookup whenever possible (10.3 and later).
                # This allows an extension to be used in any Python
                cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
+               CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
                if test ${MACOSX_DEPLOYMENT_TARGET-${cur_target}} '>' 10.2
                then
                        LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
                        BLDSHARED="$LDSHARED"
-                       CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
                else
                        LDSHARED='$(CC) $(LDFLAGS) -bundle'
                        if test "$enable_framework" ; then
index 917ed976689b736f3f120aab030ad5b505cf6acd..b92fdbd9ac5df4dda80209fb6795877401ac2a6c 100644 (file)
@@ -1325,11 +1325,11 @@ then
                # Use -undefined dynamic_lookup whenever possible (10.3 and later).
                # This allows an extension to be used in any Python
                cur_target=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'`
+               CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
                if test ${MACOSX_DEPLOYMENT_TARGET-${cur_target}} '>' 10.2
                then
                        LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
                        BLDSHARED="$LDSHARED"
-                       CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
                else
                        LDSHARED='$(CC) $(LDFLAGS) -bundle'
                        if test "$enable_framework" ; then