From 3cbdbfbf9c07577b624d660c30bfa5a8e1e69419 Mon Sep 17 00:00:00 2001 From: "Andrew M. Kuchling" Date: Tue, 6 Feb 2001 22:26:30 +0000 Subject: [PATCH] Part of patch #103544: fix detection of BSDDB on BSD systems --- setup.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index cb78091bc50..572e0e46db1 100644 --- a/setup.py +++ b/setup.py @@ -323,17 +323,17 @@ class PyBuildExt(build_ext): # (See http://electricrain.com/greg/python/bsddb3/ for an interface to # BSD DB 3.x.) - # Note: If a db.h file is found by configure, bsddb will be enabled - # automatically via Setup.config.in. It only needs to be enabled here - # if it is not automatically enabled there; check the generated - # Setup.config before enabling it here. - 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. # You need to ftp the GNU MP library. @@ -347,7 +347,6 @@ class PyBuildExt(build_ext): # FTP archive sites. One URL for it is: # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z - # Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm: if (self.compiler.find_library_file(lib_dirs, 'gmp')): exts.append( Extension('mpz', ['mpzmodule.c'], libraries = ['gmp'] ) )