Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Remove Tix detection from Tkinter part; lib-tk/Tix attempts to load Tix 

by requiring it. Also remove commentary from Setup.dist about commenting
in and out stuff.
This commit is contained in:
Martin v. Löwis 2001-03-21 07:44:53 +00:00
parent b21cb5fa7d
commit b1d196927a
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
setup.py
View File

@ -504,16 +504,7 @@ class PyBuildExt(build_ext):
def detect_tkinter(self, inc_dirs, lib_dirs): def detect_tkinter(self, inc_dirs, lib_dirs):
# The _tkinter module. # The _tkinter module.
#
# The command for _tkinter is long and site specific. Please
# uncomment and/or edit those parts as indicated. If you don't have a
# specific extension (e.g. Tix or BLT), leave the corresponding line
# commented out. (Leave the trailing backslashes in! If you
# experience strange errors, you may want to join all uncommented
# lines and remove the backslashes -- the backslash interpretation is
# done by the shell's "read" command and it may not be implemented on
# every system.
# Assume we haven't found any of the libraries or include files # Assume we haven't found any of the libraries or include files
tcllib = tklib = tcl_includes = tk_includes = None tcllib = tklib = tcl_includes = tk_includes = None
for version in ['8.4', '8.3', '8.2', '8.1', '8.0']: for version in ['8.4', '8.3', '8.2', '8.1', '8.0']:
@ -562,11 +553,6 @@ class PyBuildExt(build_ext):
include_dirs.append('/usr/X11/include') include_dirs.append('/usr/X11/include')
added_lib_dirs.append('/usr/X11/lib') added_lib_dirs.append('/usr/X11/lib')
# Check for Tix extension
if self.compiler.find_library_file(lib_dirs + added_lib_dirs, 'tix4.1.8.0'):
defs.append( ('WITH_TIX', 1) )
libs.append('tix4.1.8.0')
# Check for BLT extension # Check for BLT extension
if self.compiler.find_library_file(lib_dirs + added_lib_dirs, 'BLT8.0'): if self.compiler.find_library_file(lib_dirs + added_lib_dirs, 'BLT8.0'):
defs.append( ('WITH_BLT', 1) ) defs.append( ('WITH_BLT', 1) )