mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 74473,79974 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r74473 | guilherme.polo | 2009-08-16 16:44:14 +0200 (dim., 16 août 2009) | 13 lines

  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.
  ........
................
  r79974 | benjamin.peterson | 2010-04-12 00:04:51 +0200 (lun., 12 avril 2010) | 13 lines

  Merged revisions 79903,79907 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r79903 | martin.v.loewis | 2010-04-08 04:47:40 -0500 (Thu, 08 Apr 2010) | 2 lines

    Issue #8344: Fix test_ttk bug on FreeBSD.
  ........
    r79907 | martin.v.loewis | 2010-04-08 12:38:32 -0500 (Thu, 08 Apr 2010) | 2 lines

    Issue #8204: Fix test_ttk notebook test by forcing focus.
  ........
................
This commit is contained in:
Antoine Pitrou 2010-10-09 10:25:55 +00:00
parent be71227b83
commit 07f62a7702
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
setup.py
View file

@ -1450,8 +1450,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.find_library_file(lib_dirs, 'tk' + version)
tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version)
if tklib and tcllib: