traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 74471-74472 via svnmerge from 

svn+ssh://pythondev/python/trunk

........
  r74471 | guilherme.polo | 2009-08-16 11:34:26 -0300 (Sun, 16 Aug 2009) | 1 line

  Issue #6244: Allow detect_tkinter to look for Tcl/Tk 8.6.
........
  r74472 | guilherme.polo | 2009-08-16 11:38:57 -0300 (Sun, 16 Aug 2009) | 1 line

  Wrong place for issue #6244.
........
This commit is contained in:
Guilherme Polo 2009-08-16 14:44:14 +00:00
parent f70ce68c9c
commit 5d377bd228
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -139,6 +139,8 @@ Extension Modules
Build
-----
- Issue #6244: Allow detect_tkinter to look for Tcl/Tk 8.6.
- Issue 4601: 'make install' did not set the appropriate permissions on
directories.

4
setup.py
View File

@ -1314,8 +1314,8 @@ class PyBuildExt(build_ext):
# The versions with dots are used on Unix, and the versions without
# dots on Windows, for detection by cygwin.
tcllib = tklib = tcl_includes = tk_includes = None
for version in ['8.5', '85', '8.4', '84', '8.3', '83', '8.2',
'82', '8.1', '81', '8.0', '80']:
for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
'8.2', '82', '8.1', '81', '8.0', '80']:
tklib = self.compiler_obj.find_library_file(lib_dirs,
'tk' + version)
tcllib = self.compiler_obj.find_library_file(lib_dirs,