[Python-checkins] CVS: python/dist/src setup.py,1.73.4.1,1.73.4.2 configure.in,1.288.6.1,1.288.6.2

[Michael Hudson]

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv18640

Modified Files:
      Tag: release22-maint
	setup.py configure.in 
Log Message:
backport my checkin of
    revision 1.84 of setup.py
    revision 1.293 of configure.in

Apply Jack's patch attached to

[ 508779 ] Disable flat namespace on MacOS X

I presume you wanted this on the trunk too, Jack?

2.2.1 candidate.


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.73.4.1
retrieving revision 1.73.4.2
diff -C2 -d -r1.73.4.1 -r1.73.4.2
*** setup.py	1 Mar 2002 08:58:32 -0000	1.73.4.1
--- setup.py	7 Mar 2002 10:04:49 -0000	1.73.4.2
***************
*** 587,591 ****
              # procedure triggers on.
              frameworkdir = sysconfig.get_config_var('PYTHONFRAMEWORKDIR')
!             exts.append( Extension('gestalt', ['gestaltmodule.c']) )
              exts.append( Extension('MacOS', ['macosmodule.c'],
                          extra_link_args=['-framework', 'Carbon']) )
--- 587,592 ----
              # procedure triggers on.
              frameworkdir = sysconfig.get_config_var('PYTHONFRAMEWORKDIR')
!             exts.append( Extension('gestalt', ['gestaltmodule.c'],
!             		extra_link_args=['-framework', 'Carbon']) )
              exts.append( Extension('MacOS', ['macosmodule.c'],
                          extra_link_args=['-framework', 'Carbon']) )
***************
*** 596,601 ****
                                      '../Python/getapplbycreator.c'],
                          extra_link_args=['-framework', 'Carbon']) )
!             exts.append( Extension('_CF', ['cf/_CFmodule.c']) )
!             exts.append( Extension('_Res', ['res/_Resmodule.c']) )
              exts.append( Extension('_Snd', ['snd/_Sndmodule.c'],
                          extra_link_args=['-framework', 'Carbon']) )
--- 597,604 ----
                                      '../Python/getapplbycreator.c'],
                          extra_link_args=['-framework', 'Carbon']) )
!             exts.append( Extension('_CF', ['cf/_CFmodule.c'],
!                         extra_link_args=['-framework', 'CoreFoundation']) )
!             exts.append( Extension('_Res', ['res/_Resmodule.c'],
!                         extra_link_args=['-framework', 'Carbon']) )
              exts.append( Extension('_Snd', ['snd/_Sndmodule.c'],
                          extra_link_args=['-framework', 'Carbon']) )

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.288.6.1
retrieving revision 1.288.6.2
diff -C2 -d -r1.288.6.1 -r1.288.6.2
*** configure.in	25 Feb 2002 10:55:47 -0000	1.288.6.1
--- configure.in	7 Mar 2002 10:04:49 -0000	1.288.6.2
***************
*** 794,799 ****
  			LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
  		else
! 			# No framework. Ignore undefined symbols, assuming they come from Python
! 			LDSHARED="$LDSHARED -flat_namespace -undefined suppress"
  		fi ;;
  	Linux*) LDSHARED="gcc -shared";;
--- 794,800 ----
  			LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
  		else
! 			# No framework, use the Python app as bundle-loader
! 			BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
! 			LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/$(PYTHON)'
  		fi ;;
  	Linux*) LDSHARED="gcc -shared";;