Patch #103578 ] _tkinter build fix for he current Debian unstable tcl/tk 8.3

    packages

diff --git a/setup.py b/setup.py
index 4c42a6550b71e71331b882ba61d03fb3049d8e26..cb78091bc5055289bc92bef4aa4c4cd97c44235b 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -495,14 +495,10 @@ class PyBuildExt(build_ext):
         if tklib and tcllib:
             # Check for the include files on Debian, where
             # they're put in /usr/include/{tcl,tk}X.Y
-            debian_tcl_include = ( '/usr/include/tcl' + version )
-            debian_tk_include =  ( '/usr/include/tk'  + version )
-            tcl_includes = find_file('tcl.h', inc_dirs,
-                                     [debian_tcl_include]
-                                     )
-            tk_includes = find_file('tk.h', inc_dirs,
-                                     [debian_tk_include]
-                                     )
+            debian_tcl_include = [ '/usr/include/tcl' + version ]
+            debian_tk_include =  [ '/usr/include/tk'  + version ] + debian_tcl_include
+            tcl_includes = find_file('tcl.h', inc_dirs, debian_tcl_include)
+            tk_includes = find_file('tk.h', inc_dirs, debian_tk_include)
 
         if (tcllib is None or tklib is None and
             tcl_includes is None or tk_includes is None):