[Python-checkins] CVS: python/dist/src setup.py,1.1,1.2
A.M. Kuchling
akuchling@users.sourceforge.net
Wed, 17 Jan 2001 07:59:28 -0800
Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv15164
Modified Files:
setup.py
Log Message:
Various clean-ups:
* Uncomment the xreadlines module
* The Tcl/Tk detection code doesn't need to worry about pre-8.0 versions
* Fix some debugging changes (not running ar, a commented-out line)
Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** setup.py 2001/01/17 15:23:23 1.1
--- setup.py 2001/01/17 15:59:25 1.2
***************
*** 60,64 ****
ar, library = sysconfig.get_config_vars('AR', 'LIBRARY')
cmd = '%s d Modules/%s sigcheck.o intrcheck.o' % (ar, library)
! # os.system(cmd)
build_ext.build_extensions(self)
--- 60,64 ----
ar, library = sysconfig.get_config_vars('AR', 'LIBRARY')
cmd = '%s d Modules/%s sigcheck.o intrcheck.o' % (ar, library)
! os.system(cmd)
build_ext.build_extensions(self)
***************
*** 69,73 ****
lib_dirs = self.compiler.library_dirs[:]
lib_dirs += ['/lib', '/usr/lib', '/usr/local/lib']
- # std_lib_dirs = ['/lib', '/usr/lib']
exts = []
--- 69,72 ----
***************
*** 84,89 ****
exts.append( Extension('signal', ['signalmodule.c']) )
! # XXX uncomment this with 2.0CVS
! #exts.append( Extension('xreadlines', ['xreadlines.c']) )
# array objects
--- 83,87 ----
exts.append( Extension('signal', ['signalmodule.c']) )
! exts.append( Extension('xreadlines', ['xreadlinesmodule.c']) )
# array objects
***************
*** 367,380 ****
# every system.
! # XXX need to add the old 7.x/4.x unsynced version numbers here
! for tcl_version, tk_version in [('8.4', '8.4'),
! ('8.3', '8.3'),
! ('8.2', '8.2'),
! ('8.1', '8.1'),
! ('8.0', '8.0')]:
tklib = self.compiler.find_library_file(lib_dirs,
! 'tk' + tk_version )
tcllib = self.compiler.find_library_file(lib_dirs,
! 'tcl' + tcl_version )
if tklib and tcllib:
# Exit the loop when we've found the Tcl/Tk libraries
--- 365,373 ----
# every system.
! for version in ['8.4', '8.3', '8.2', '8.1', '8.0']:
tklib = self.compiler.find_library_file(lib_dirs,
! 'tk' + version )
tcllib = self.compiler.find_library_file(lib_dirs,
! 'tcl' + version )
if tklib and tcllib:
# Exit the loop when we've found the Tcl/Tk libraries
***************
*** 396,404 ****
# Check for the include files on Debian, where
# they're put in /usr/include/{tcl,tk}X.Y
- # XXX currently untested
debian_tcl_include = ( prefix + os.sep + 'include/tcl' +
! tcl_version )
debian_tk_include = ( prefix + os.sep + 'include/tk' +
! tk_version )
if os.path.exists(debian_tcl_include):
include_dirs = [debian_tcl_include, debian_tk_include]
--- 389,396 ----
# Check for the include files on Debian, where
# they're put in /usr/include/{tcl,tk}X.Y
debian_tcl_include = ( prefix + os.sep + 'include/tcl' +
! version )
debian_tk_include = ( prefix + os.sep + 'include/tk' +
! version )
if os.path.exists(debian_tcl_include):
include_dirs = [debian_tcl_include, debian_tk_include]