diff options
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | configure.in | 9 |
2 files changed, 11 insertions, 9 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.440 . +# From configure.in Revision: 1.441 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57 for python 2.4. # @@ -9991,7 +9991,6 @@ then BASECFLAGS="$BASECFLAGS -fno-common -dynamic" # -F. is needed to allow linking to the framework while # in the build location. - LDFLAGS="$LDFLAGS -Wl,-F." cat >>confdefs.h <<\_ACEOF #define WITH_NEXT_FRAMEWORK 1 @@ -10085,7 +10084,8 @@ then LDSHARED='$(CC) $(LDFLAGS) -bundle' if test "$enable_framework" ; then # Link against the framework. All externals should be defined. - LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)' + BLDSHARED="$LDSHARED "'-Wl,-F. -framework $(PYTHONFRAMEWORK)' + LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)' else # No framework. Ignore undefined symbols, assuming they come from Python LDSHARED="$LDSHARED -undefined suppress" @@ -10094,7 +10094,8 @@ then LDSHARED='$(CC) $(LDFLAGS) -bundle' if test "$enable_framework" ; then # Link against the framework. All externals should be defined. - LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)' + BLDSHARED="$LDSHARED "'-Wl,-F. -framework $(PYTHONFRAMEWORK)' + LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)' @@ -10191,7 +10192,7 @@ then LINKFORSHARED="$extra_undefs -framework System" if test "$enable_framework" then - LINKFORSHARED="$LINKFORSHARED -framework Python" + LINKFORSHARED="$LINKFORSHARED -Wl,-F. -framework Python" fi LINKFORSHARED="$LINKFORSHARED $extra_frameworks";; OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";; diff --git a/configure.in b/configure.in index e0dd64d..9a4183c 100644 --- a/configure.in +++ b/configure.in @@ -1185,7 +1185,6 @@ then BASECFLAGS="$BASECFLAGS -fno-common -dynamic" # -F. is needed to allow linking to the framework while # in the build location. - LDFLAGS="$LDFLAGS -Wl,-F." AC_DEFINE(WITH_NEXT_FRAMEWORK, 1, [Define if you want to produce an OpenStep/Rhapsody framework (shared library plus accessory files).]) @@ -1268,7 +1267,8 @@ then LDSHARED='$(CC) $(LDFLAGS) -bundle' if test "$enable_framework" ; then # Link against the framework. All externals should be defined. - LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)' + BLDSHARED="$LDSHARED "'-Wl,-F. -framework $(PYTHONFRAMEWORK)' + LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)' else # No framework. Ignore undefined symbols, assuming they come from Python LDSHARED="$LDSHARED -undefined suppress" @@ -1277,7 +1277,8 @@ then LDSHARED='$(CC) $(LDFLAGS) -bundle' if test "$enable_framework" ; then # Link against the framework. All externals should be defined. - LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)' + BLDSHARED="$LDSHARED "'-Wl,-F. -framework $(PYTHONFRAMEWORK)' + LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)' @@ -1370,7 +1371,7 @@ then LINKFORSHARED="$extra_undefs -framework System" if test "$enable_framework" then - LINKFORSHARED="$LINKFORSHARED -framework Python" + LINKFORSHARED="$LINKFORSHARED -Wl,-F. -framework Python" fi LINKFORSHARED="$LINKFORSHARED $extra_frameworks";; OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";; |