[Python-checkins] CVS: python/dist/src setup.py,1.69,1.70

[Jack Jansen]

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

Modified Files:
	setup.py 
Log Message:
Mods to make WASTE module compile and link for MachoPython. Not tested
any further, yet.


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** setup.py	2001/12/06 22:59:54	1.69
--- setup.py	2001/12/09 23:08:54	1.70
***************
*** 635,639 ****
                  exts.append( Extension('_TE', ['te/_TEmodule.c'],
              		extra_link_args=['-framework', 'Carbon']) )
! ##              exts.append( Extension('waste', ['waste/wastemodule.c']) )
                  exts.append( Extension('_Win', ['win/_Winmodule.c'],
              		extra_link_args=['-framework', 'Carbon']) )
--- 635,657 ----
                  exts.append( Extension('_TE', ['te/_TEmodule.c'],
              		extra_link_args=['-framework', 'Carbon']) )
!                 # As there is no standardized place (yet) to put user-installed
!                 # Mac libraries on OSX you should put a symlink to your Waste
!                 # installation in the same folder as your python source tree.
!                 # Or modify the next two lines:-)
!                 waste_incs = find_file("WASTE.h", [], ["../waste/C_C++ Headers"])
!                 waste_libs = find_library_file(self.compiler, "WASTE", [],
!                         ["../waste/Static Libraries"])
!                 if waste_incs != None and waste_libs != None:
!                     exts.append( Extension('waste', 
!                                    ['waste/wastemodule.c',
!                                     'Mac/Wastemods/WEObjectHandlers.c',
!                                     'Mac/Wastemods/WETabHooks.c',
!                                     'Mac/Wastemods/WETabs.c'
!                                    ],
!                                    include_dirs = waste_incs + ['Mac/Wastemods'],
!                                    library_dirs = waste_libs,
!                                    libraries = ['WASTE'],
!                                    extra_link_args = ['-framework', 'Carbon'],
!                     ) )
                  exts.append( Extension('_Win', ['win/_Winmodule.c'],
              		extra_link_args=['-framework', 'Carbon']) )