[Python-checkins] CVS: python/dist/src setup.py,1.28,1.29

[A.M. Kuchling]

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

Modified Files:
	setup.py 
Log Message:
Patch #103937: Attempt to get the BSDDB autodetection right (or at least
    less wrong)


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** setup.py	2001/02/21 02:38:24	1.28
--- setup.py	2001/02/23 16:27:48	1.29
***************
*** 326,340 ****
          # BSD DB 3.x.)
  
!         db_incs = find_file('db_185.h', inc_dirs, [])
!         if (db_incs is not None and
!             self.compiler.find_library_file(lib_dirs, 'db') ):
              exts.append( Extension('bsddb', ['bsddbmodule.c'],
!                                    include_dirs = db_incs,
!                                    libraries = ['db'] ) )
!         else:
!             db_incs = find_file('db.h', inc_dirs, [])
!             if db_incs is not None:
!                 exts.append( Extension('bsddb', ['bsddbmodule.c'],
!                                        include_dirs = db_incs) )
  
          # The mpz module interfaces to the GNU Multiple Precision library.
--- 326,345 ----
          # BSD DB 3.x.)
  
!         dblib = []
!         if self.compiler.find_library_file(lib_dirs, 'db'):
!             dblib = ['db']
!         
!         db185_incs = find_file('db_185.h', inc_dirs,
!                                ['/usr/include/db3', '/usr/include/db2'])
!         db_inc = find_file('db.h', inc_dirs, ['/usr/include/db1'])
!         if db185_incs is not None:
              exts.append( Extension('bsddb', ['bsddbmodule.c'],
!                                    include_dirs = db185_incs,
!                                    define_macros=[('HAVE_DB_185_H',1)],
!                                    libraries = dblib ) )
!         elif db_inc is not None:
!             exts.append( Extension('bsddb', ['bsddbmodule.c'],
!                                    include_dirs = db_inc,
!                                    libraries = dblib) )
  
          # The mpz module interfaces to the GNU Multiple Precision library.