[Python-checkins] CVS: python/dist/src setup.py,1.50.2.1,1.50.2.2

[Guido van Rossum]

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

Modified Files:
      Tag: r22a2-branch
	setup.py 
Log Message:
Merge trunk->branch

Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.50.2.1
retrieving revision 1.50.2.2
diff -C2 -d -r1.50.2.1 -r1.50.2.2
*** setup.py	2001/08/19 05:40:58	1.50.2.1
--- setup.py	2001/08/21 13:29:40	1.50.2.2
***************
*** 386,390 ****
  
          dblib = []
!         if self.compiler.find_library_file(lib_dirs, 'db'):
              dblib = ['db']
          
--- 386,396 ----
  
          dblib = []
!         if self.compiler.find_library_file(lib_dirs, 'db-3.1'):
!             dblib = ['db-3.1']
!         elif self.compiler.find_library_file(lib_dirs, 'db2'):
!             dblib = ['db2']
!         elif self.compiler.find_library_file(lib_dirs, 'db1'):
!             dblib = ['db1']
!         elif self.compiler.find_library_file(lib_dirs, 'db'):
              dblib = ['db']