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

akuchling · akuchling · commit 9a3fd8c82f01 · 2001-02-06T22:15:27.000Z
packages
diff --git a/setup.py b/setup.py
@@ -495,14 +495,10 @@ def detect_tkinter(self, inc_dirs, lib_dirs):
         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):
