[Python-checkins] CVS: python/dist/src setup.py,1.42,1.43

[Martin v. L?wis]

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

Modified Files:
	setup.py 
Log Message:
Patch #443669: Permit _tkinter to build on cygwin32.


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** setup.py	2001/07/14 20:28:10	1.42
--- setup.py	2001/07/24 06:54:01	1.43
***************
*** 528,533 ****
          
          # Assume we haven't found any of the libraries or include files
          tcllib = tklib = tcl_includes = tk_includes = None
!         for version in ['8.4', '8.3', '8.2', '8.1', '8.0']:
               tklib = self.compiler.find_library_file(lib_dirs,
                                                       'tk' + version )
--- 528,536 ----
          
          # Assume we haven't found any of the libraries or include files
+         # 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.4', '84', '8.3', '83', '8.2',
!                         '82', '8.1', '81', '8.0', '80']:
               tklib = self.compiler.find_library_file(lib_dirs,
                                                       'tk' + version )
***************
*** 587,592 ****
              libs.append('ld')
  
!         # Finally, link with the X11 libraries
!         libs.append('X11')
  
          ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
--- 590,596 ----
              libs.append('ld')
  
!         # Finally, link with the X11 libraries (not appropriate on cygwin)
!         if platform != "cygwin":
!             libs.append('X11')
  
          ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],