[Python-checkins] CVS: python/dist/src setup.py,1.24,1.25

A.M. Kuchling akuchling@users.sourceforge.net
Tue, 06 Feb 2001 14:15:30 -0800


Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv15856

Modified Files:
	setup.py 
Log Message:
Patch #103578 ] _tkinter build fix for he current Debian unstable tcl/tk 8.3 
    packages


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** setup.py	2001/02/04 03:09:52	1.24
--- setup.py	2001/02/06 22:15:27	1.25
***************
*** 496,507 ****
              # 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]
!                                      )
  
          if (tcllib is None or tklib is None and
--- 496,503 ----
              # 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 ] + 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