[Python-checkins] python/dist/src setup.py,1.141,1.142

[jlt63@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv7952

Modified Files:
	setup.py 
Log Message:
This patch enables Cygwin Python to build _tkinter against Tcl/Tk 8.4.
Note that this patch just reverts the lib_prefix (i.e., "cyg") portion
of my Tcl/Tk 8.3 patch. It seems that Cygwin Tcl/Tk is using a more
normal file naming convention again.


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.141
retrieving revision 1.142
diff -C2 -d -r1.141 -r1.142
*** setup.py	2 Feb 2003 17:59:05 -0000	1.141
--- setup.py	5 Feb 2003 15:06:46 -0000	1.142
***************
*** 916,925 ****
              return
  
-         # Set platform specific library prefix, if any
-         if platform == 'cygwin':
-             lib_prefix = 'cyg'
-         else:
-             lib_prefix = ''
- 
          # Assume we haven't found any of the libraries or include files
          # The versions with dots are used on Unix, and the versions without
--- 916,919 ----
***************
*** 928,935 ****
          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,
!                                                     lib_prefix + 'tk' + version)
!             tcllib = self.compiler.find_library_file(lib_dirs,
!                                                      lib_prefix + 'tcl' + version)
              if tklib and tcllib:
                  # Exit the loop when we've found the Tcl/Tk libraries
--- 922,927 ----
          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)
!             tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version)
              if tklib and tcllib:
                  # Exit the loop when we've found the Tcl/Tk libraries
***************
*** 989,994 ****
  
          # Add the Tcl/Tk libraries
!         libs.append(lib_prefix + 'tk'+ version)
!         libs.append(lib_prefix + 'tcl'+ version)
  
          if platform in ['aix3', 'aix4']:
--- 981,986 ----
  
          # Add the Tcl/Tk libraries
!         libs.append('tk'+ version)
!         libs.append('tcl'+ version)
  
          if platform in ['aix3', 'aix4']: