[Python-checkins] CVS: python/dist/src setup.py,1.61,1.62

[Neil Schemenauer]

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

Modified Files:
	setup.py 
Log Message:
- Build dbm module using libdb1 if it's available.  This fixes SF bug "[
  #230075 ] dbmmodule build fails on Debian GNU/Linux unstable (Sid)".

- Build bsddb module with libdb3 if it's available.  It also fixes a bug that
  causes the build of bsddb to fail on Debian if bsddb3-dev is installed.


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** setup.py	2001/10/17 13:46:44	1.61
--- setup.py	2001/10/21 22:14:44	1.62
***************
*** 363,366 ****
--- 363,369 ----
                  exts.append( Extension('dbm', ['dbmmodule.c'],
                                         libraries = ['ndbm'] ) )
+             elif self.compiler.find_library_file(lib_dirs, 'db1'):
+                 exts.append( Extension('dbm', ['dbmmodule.c'],
+                                        libraries = ['db1'] ) )
              else:
                  exts.append( Extension('dbm', ['dbmmodule.c']) )
***************
*** 385,388 ****
--- 388,393 ----
          if self.compiler.find_library_file(lib_dirs, 'db-3.1'):
              dblib = ['db-3.1']
+         elif self.compiler.find_library_file(lib_dirs, 'db3'):
+             dblib = ['db3']
          elif self.compiler.find_library_file(lib_dirs, 'db2'):
              dblib = ['db2']