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.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index ee5e62b263629126d470469f463071f4bf81df4d..5f0b8c12327414ab666082a2163da98b1d4fab4e 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.
 

diff --git a/setup.py b/setup.py
index f44550ef4e3d79bd5c510c8c9bb9813e3bddb759..14d0adb4748210d87ab438cb14329a94e2d3f31f 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -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,