[Python-checkins] python/dist/src configure.in, 1.441, 1.442 configure, 1.431, 1.432

Sun Dec 7 20:10:15 EST 2003

Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31459
Modified Files:
	configure.in configure 
Log Message:
Revamped framework search path handling for MacOSX. This should allow
two framework builds (in /Library and /System/Library) to coexist
with distutils linking against the right one.
Should be backported to 2.3, but getting Apple-supplied Python to pick
up these fixes is going to be non-trivial.
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.441
retrieving revision 1.442
diff -C2 -d -r1.441 -r1.442
*** configure.in	18 Nov 2003 20:00:44 -0000	1.441
--- configure.in	8 Dec 2003 01:10:12 -0000	1.442
***************
*** 1186,1190 ****
 	# -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
--- 1186,1189 ----
***************
*** 1269,1273 ****
 		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
--- 1268,1273 ----
 		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)'
 		else
 			# No framework. Ignore undefined symbols, assuming they come from Python
***************
*** 1278,1282 ****
 		if test "$enable_framework" ; then
 			# Link against the framework. All externals should be defined.
! 			LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
 		else
 			# No framework, use the Python app as bundle-loader
--- 1278,1283 ----
 		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)'
 		else
 			# No framework, use the Python app as bundle-loader
***************
*** 1371,1375 ****
 		if test "$enable_framework"
 		then
! 			LINKFORSHARED="$LINKFORSHARED -framework Python"
 		fi
 		LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;
--- 1372,1376 ----
 		if test "$enable_framework"
 		then
! 			LINKFORSHARED="$LINKFORSHARED -Wl,-F. -framework Python"
 		fi
 		LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.431
retrieving revision 1.432
diff -C2 -d -r1.431 -r1.432
*** configure	18 Nov 2003 20:00:15 -0000	1.431
--- configure	8 Dec 2003 01:10:12 -0000	1.432
***************
*** 1,4 ****
 #! /bin/sh
! # From configure.in Revision: 1.440 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.57 for python 2.4.
--- 1,4 ----
 #! /bin/sh
! # 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.
***************
*** 9992,9996 ****
 	# -F. is needed to allow linking to the framework while
 	# in the build location.
- 	LDFLAGS="$LDFLAGS -Wl,-F."
 
 cat >>confdefs.h <<\_ACEOF
--- 9992,9995 ----
***************
*** 10086,10090 ****
 		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
--- 10085,10090 ----
 		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)'
 		else
 			# No framework. Ignore undefined symbols, assuming they come from Python
***************
*** 10095,10099 ****
 		if test "$enable_framework" ; then
 			# Link against the framework. All externals should be defined.
! 			LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
 		else
 			# No framework, use the Python app as bundle-loader
--- 10095,10100 ----
 		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)'
 		else
 			# No framework, use the Python app as bundle-loader
***************
*** 10192,10196 ****
 		if test "$enable_framework"
 		then
! 			LINKFORSHARED="$LINKFORSHARED -framework Python"
 		fi
 		LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;
--- 10193,10197 ----
 		if test "$enable_framework"
 		then
! 			LINKFORSHARED="$LINKFORSHARED -Wl,-F. -framework Python"
 		fi
 		LINKFORSHARED="$LINKFORSHARED $extra_frameworks";;