]> granicus.if.org Git - python/commitdiff
Always set CONFIGURE_MACOSX_DEPLOYMENT_TARGET otherwise it may be set
authorJack Jansen <jack.jansen@cwi.nl>
Fri, 7 Jan 2005 10:49:32 +0000 (10:49 +0000)
committerJack Jansen <jack.jansen@cwi.nl>
Fri, 7 Jan 2005 10:49:32 +0000 (10:49 +0000)
to an empty value and distutils will get confused lateron.

configure
configure.in

index ca9134fbae2758f923b887ba0ce43450e3b363fe..edb0b16ae0d42831b5e31d6796e7006abeba3b08 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.477 .
+# From configure.in Revision: 1.478 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for python 2.5.
 #
@@ -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 9371a577c80439965972116d5ac640e61373b44c..ba56c05ca469876e727eead957b1a47ec33f2b74 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