OSX tests used specific version numbers to test for new features and

used the default Darwin/* for the old code. Reversed those tests so
that compatibility code is in a switch leg with a specific version and
newer systems take the default leg.

This should allow Python to build on OSX 10.1.1 (which jumps from Darwin/1.4
to Darwin/5.1 due to a new numbering scheme).

diff --git a/configure b/configure
index 2b278d423ba3f05e8b0e624a744e0713276bd64f..fb945c8f908b377797cb3c256dadcc55e81e6ec2 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.279 
+# From configure.in Revision: 1.280 
 
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
@@ -3045,16 +3045,16 @@ echo "$ac_t""$enable_toolbox_glue" 1>&6
 
 
 case $ac_sys_system/$ac_sys_release in
-  Darwin/1.4*)
+  Darwin/1.3*)
     ns_undef_sym='_environ'
-    LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -flat_namespace -U $ns_undef_sym"
-      LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
+    LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -U $ns_undef_sym"
+       LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
   Darwin/*)
     ns_undef_sym='_environ'
-    LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -U $ns_undef_sym"
-       LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
+    LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -flat_namespace -U $ns_undef_sym"
+      LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
 esac
@@ -3070,8 +3070,8 @@ then
        # in the build location.
        
        case $ac_sys_system/$ac_sys_release in
-           Darwin/1.4*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-flat_namespace,-U,$ns_undef_sym";;
-           Darwin/*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-U,$ns_undef_sym";;
+           Darwin/1.3*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-U,$ns_undef_sym";;
+           Darwin/*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-flat_namespace,-U,$ns_undef_sym";;
        esac
        cat >> confdefs.h <<\EOF
 #define WITH_NEXT_FRAMEWORK 1
@@ -3144,14 +3144,14 @@ then
        hp*|HP*) LDSHARED="ld -b";;
        OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
        DYNIX/ptx*) LDSHARED="ld -G";;
-       Darwin/1.4*)
+       Darwin/1.3*)
                LDSHARED='$(CC) $(LDFLAGS) -bundle'
                if test "$enable_framework" ; then
                        # Link against the framework. All externals should be defined.
                        LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
                else
                        # No framework. Ignore undefined symbols, assuming they come from Python
-                       LDSHARED="$LDSHARED -flat_namespace -undefined suppress"
+                       LDSHARED="$LDSHARED -undefined suppress"
                fi ;;
        Darwin/*)
                LDSHARED='$(CC) $(LDFLAGS) -bundle'
@@ -3160,7 +3160,7 @@ then
                        LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
                else
                        # No framework. Ignore undefined symbols, assuming they come from Python
-                       LDSHARED="$LDSHARED -undefined suppress"
+                       LDSHARED="$LDSHARED -flat_namespace -undefined suppress"
                fi ;;
        Linux*) LDSHARED="gcc -shared";;
        dgux*) LDSHARED="ld -G";;

diff --git a/configure.in b/configure.in
index 34a080607f9291fc56c32f8ca3b4b5d442f2c92d..68d352e978e176ab268f12730f0ccb25780cd305 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -670,16 +670,16 @@ AC_MSG_RESULT($enable_toolbox_glue)
 
 AC_SUBST(LIBTOOL_CRUFT)
 case $ac_sys_system/$ac_sys_release in
-  Darwin/1.4*)
+  Darwin/1.3*)
     ns_undef_sym='_environ'
-    LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -flat_namespace -U $ns_undef_sym"
-      LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
+    LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -U $ns_undef_sym"
+       LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
   Darwin/*)
     ns_undef_sym='_environ'
-    LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -U $ns_undef_sym"
-       LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
+    LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -flat_namespace -U $ns_undef_sym"
+      LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
 esac
@@ -694,8 +694,8 @@ then
        # in the build location.
        
        case $ac_sys_system/$ac_sys_release in
-           Darwin/1.4*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-flat_namespace,-U,$ns_undef_sym";;
-           Darwin/*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-U,$ns_undef_sym";;
+           Darwin/1.3*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-U,$ns_undef_sym";;
+           Darwin/*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-flat_namespace,-U,$ns_undef_sym";;
        esac
        AC_DEFINE(WITH_NEXT_FRAMEWORK)
        AC_MSG_RESULT(yes)
@@ -759,14 +759,14 @@ then
        hp*|HP*) LDSHARED="ld -b";;
        OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
        DYNIX/ptx*) LDSHARED="ld -G";;
-       Darwin/1.4*)
+       Darwin/1.3*)
                LDSHARED='$(CC) $(LDFLAGS) -bundle'
                if test "$enable_framework" ; then
                        # Link against the framework. All externals should be defined.
                        LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
                else
                        # No framework. Ignore undefined symbols, assuming they come from Python
-                       LDSHARED="$LDSHARED -flat_namespace -undefined suppress"
+                       LDSHARED="$LDSHARED -undefined suppress"
                fi ;;
        Darwin/*)
                LDSHARED='$(CC) $(LDFLAGS) -bundle'
@@ -775,7 +775,7 @@ then
                        LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
                else
                        # No framework. Ignore undefined symbols, assuming they come from Python
-                       LDSHARED="$LDSHARED -undefined suppress"
+                       LDSHARED="$LDSHARED -flat_namespace -undefined suppress"
                fi ;;
        Linux*) LDSHARED="gcc -shared";;
        dgux*) LDSHARED="ld -G";;