[Python-checkins] python/dist/src/Lib/distutils cygwinccompiler.py, 1.26, 1.27

[loewis at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/distutils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11874

Modified Files:
	cygwinccompiler.py 
Log Message:
Patch #870382: Automatically add msvcr71 to the list of libraries if
Python was built with VC 7.1.


Index: cygwinccompiler.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/cygwinccompiler.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** cygwinccompiler.py	18 Jul 2004 06:14:42 -0000	1.26
--- cygwinccompiler.py	3 Aug 2004 12:41:42 -0000	1.27
***************
*** 123,126 ****
--- 123,137 ----
          else:
              self.dll_libraries=[]
+ 	    # Include the appropriate MSVC runtime library if Python was built
+ 	    # with MSVC 7.0 or 7.1.
+ 	    msc_pos = sys.version.find('MSC v.')
+ 	    if msc_pos != -1:
+ 		msc_ver = sys.version[msc_pos+6:msc_pos+10]
+ 		if msc_ver == '1300':
+ 		    # MSVC 7.0
+ 		    self.dll_libraries = ['msvcr70']
+ 		elif msc_ver == '1310':
+ 		    # MSVC 7.1
+ 		    self.dll_libraries = ['msvcr71']
  
      # __init__ ()
***************
*** 309,312 ****
--- 320,335 ----
          self.dll_libraries=[]
  
+ 	# Include the appropriate MSVC runtime library if Python was built
+ 	# with MSVC 7.0 or 7.1.
+ 	msc_pos = sys.version.find('MSC v.')
+ 	if msc_pos != -1:
+ 	    msc_ver = sys.version[msc_pos+6:msc_pos+10]
+ 	    if msc_ver == '1300':
+ 		# MSVC 7.0
+ 		self.dll_libraries = ['msvcr70']
+ 	    elif msc_ver == '1310':
+ 		# MSVC 7.1
+ 		self.dll_libraries = ['msvcr71']
+ 
      # __init__ ()