--- cygwinccompiler.py.orig	2004-06-15 18:56:56.000000000 +0100
+++ cygwinccompiler.py	2004-07-09 12:15:33.000000000 +0100
@@ -122,6 +122,17 @@
                 "Consider upgrading to a newer version of gcc")
         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__ ()
 
@@ -308,6 +319,18 @@
         # no additional libraries needed
         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__ ()
 
 # class Mingw32CCompiler