(original) (raw)

Index: dist/src/configure.in =================================================================== RCS file: /cvsroot/python/python/dist/src/configure.in,v retrieving revision 1.478 diff -u -r1.478 configure.in --- dist/src/configure.in 26 Dec 2004 23:07:35 -0000 1.478 +++ dist/src/configure.in 7 Jan 2005 09:56:27 -0000 @@ -1304,8 +1304,8 @@ LDSHARED='$(CC) (LDFLAGS)−bundle′iftest"(LDFLAGS) -bundle' if test "(LDFLAGS)−bundle′iftest"enable_framework" ; then # Link against the framework. All externals should be defined. - BLDSHARED="$LDSHARED "'-Wl,-F. -framework (PYTHONFRAMEWORK)′−LDSHARED="(PYTHONFRAMEWORK)' - LDSHARED="(PYTHONFRAMEWORK)′−LDSHARED="LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework (PYTHONFRAMEWORK)′+BLDSHARED="(PYTHONFRAMEWORK)' + BLDSHARED="(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 @@ LDSHARED='$(CC) (LDFLAGS)−bundle′iftest"(LDFLAGS) -bundle' if test "(LDFLAGS)−bundle′iftest"enable_framework" ; then # Link against the framework. All externals should be defined. - BLDSHARED="$LDSHARED "'-Wl,-F. -framework (PYTHONFRAMEWORK)′−LDSHARED="(PYTHONFRAMEWORK)' - LDSHARED="(PYTHONFRAMEWORK)′−LDSHARED="LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework (PYTHONFRAMEWORK)′+BLDSHARED="(PYTHONFRAMEWORK)' + BLDSHARED="(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@@LDSHARED=′(BUILDPYTHON)' @@ -1334,8 +1334,8 @@ LDSHARED='(BUILDPYTHON)′@@−1334,8+1334,8@@LDSHARED=′(CC) (LDFLAGS)−bundle′iftest"(LDFLAGS) -bundle' if test "(LDFLAGS)−bundle′iftest"enable_framework" ; then # Link against the framework. All externals should be defined. - BLDSHARED="$LDSHARED "'-Wl,-F. -framework (PYTHONFRAMEWORK)′−LDSHARED="(PYTHONFRAMEWORK)' - LDSHARED="(PYTHONFRAMEWORK)′−LDSHARED="LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework (PYTHONFRAMEWORK)′+BLDSHARED="(PYTHONFRAMEWORK)' + BLDSHARED="(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@@LINKFORSHARED="(BUILDPYTHON)' @@ -1427,7 +1427,7 @@ LINKFORSHARED="(BUILDPYTHON)′@@−1427,7+1427,7@@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";;