Backport of Patch #1097739 by Bob Ippolito:

MacOSX: if we cannot use -undefined dynamic_lookup (such as on 10.2 or earlier)
we link extension directly against the dynamic library in the framework in
stead of against the framework. This will fix building extensions for 2.3
after 2.4 has been installed too.

diff --git a/configure b/configure
index ec0ccae72821baa87a2773708b100477c12a3922..6e5677cffada24bc74d1c5f00a6e6516027fc4da 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.475.2.3 .
+# From configure.in Revision: 1.475.2.4 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for python 2.4.
 #
@@ -10302,8 +10302,8 @@ then
                LDSHARED='$(CC) $(LDFLAGS) -bundle'
                if test "$enable_framework" ; then
                        # Link against the framework. All externals should be defined.
-                       BLDSHARED="$LDSHARED "'-Wl,-F. -framework $(PYTHONFRAMEWORK)'
-                       LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
+                       BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+                       LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                else
                        # No framework. Ignore undefined symbols, assuming they come from Python
                        LDSHARED="$LDSHARED -undefined suppress"
@@ -10312,8 +10312,8 @@ then
                LDSHARED='$(CC) $(LDFLAGS) -bundle'
                if test "$enable_framework" ; then
                        # Link against the framework. All externals should be defined.
-                       BLDSHARED="$LDSHARED "'-Wl,-F. -framework $(PYTHONFRAMEWORK)'
-                       LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
+                       BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+                       LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                else
                        # No framework, use the Python app as bundle-loader
                        BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
@@ -10332,8 +10332,8 @@ then
                        LDSHARED='$(CC) $(LDFLAGS) -bundle'
                        if test "$enable_framework" ; then
                                # Link against the framework. All externals should be defined.
-                               BLDSHARED="$LDSHARED "'-Wl,-F. -framework $(PYTHONFRAMEWORK)'
-                               LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
+                               BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+                               LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                        else
                                # No framework, use the Python app as bundle-loader
                                BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
@@ -10429,7 +10429,7 @@ then
                LINKFORSHARED="$extra_undefs"
                if test "$enable_framework"
                then
-                       LINKFORSHARED="$LINKFORSHARED -Wl,-F. -framework "'$(PYTHONFRAMEWORK)'
+                       LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                fi
                LINKFORSHARED="$LINKFORSHARED";;
        OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;

diff --git a/configure.in b/configure.in
index b92fdbd9ac5df4dda80209fb6795877401ac2a6c..d6ae4bf46e07f10331b370825934b111a2fc79e9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1304,8 +1304,8 @@ then
                LDSHARED='$(CC) $(LDFLAGS) -bundle'
                if test "$enable_framework" ; then
                        # Link against the framework. All externals should be defined.
-                       BLDSHARED="$LDSHARED "'-Wl,-F. -framework $(PYTHONFRAMEWORK)'
-                       LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
+                       BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+                       LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                else
                        # No framework. Ignore undefined symbols, assuming they come from Python
                        LDSHARED="$LDSHARED -undefined suppress"
@@ -1314,8 +1314,8 @@ then
                LDSHARED='$(CC) $(LDFLAGS) -bundle'
                if test "$enable_framework" ; then
                        # Link against the framework. All externals should be defined.
-                       BLDSHARED="$LDSHARED "'-Wl,-F. -framework $(PYTHONFRAMEWORK)'
-                       LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
+                       BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+                       LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                else
                        # No framework, use the Python app as bundle-loader
                        BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
@@ -1334,8 +1334,8 @@ then
                        LDSHARED='$(CC) $(LDFLAGS) -bundle'
                        if test "$enable_framework" ; then
                                # Link against the framework. All externals should be defined.
-                               BLDSHARED="$LDSHARED "'-Wl,-F. -framework $(PYTHONFRAMEWORK)'
-                               LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
+                               BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+                               LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                        else
                                # No framework, use the Python app as bundle-loader
                                BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
@@ -1427,7 +1427,7 @@ then
                LINKFORSHARED="$extra_undefs"
                if test "$enable_framework"
                then
-                       LINKFORSHARED="$LINKFORSHARED -Wl,-F. -framework "'$(PYTHONFRAMEWORK)'
+                       LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                fi
                LINKFORSHARED="$LINKFORSHARED";;
        OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;