diff options
| author | Skip Montanaro <skip@pobox.com> | 2008-12-06 17:39:54 (GMT) |
|---|---|---|
| committer | Skip Montanaro <skip@pobox.com> | 2008-12-06 17:39:54 (GMT) |
| commit | b7387a5e0d6e7adc28758e1f7597387d318e6ea7 (patch) | |
| tree | cba32fc97726f18788e21aabb172cad2d6eeff1c | |
| parent | 514624d29e04a04e211a4e7536f2ebba70ed629a (diff) | |
| download | cpython-b7387a5e0d6e7adc28758e1f7597387d318e6ea7.zip cpython-b7387a5e0d6e7adc28758e1f7597387d318e6ea7.tar.gz cpython-b7387a5e0d6e7adc28758e1f7597387d318e6ea7.tar.bz2 | |
issue4483: dbm build failures on systems with gdbm_compat lib.
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/dbmmodule.c | 3 | ||||
| -rw-r--r-- | setup.py | 16 |
3 files changed, 20 insertions, 2 deletions
@@ -23,6 +23,9 @@ Core and Builtins Library ------- +- Issue #4483: _dbm module now builds on systems with gdbm & gdbm_compat + libs. + - FileIO's mode attribute now always includes ``"b"``. diff --git a/Modules/dbmmodule.c b/Modules/dbmmodule.c index c91ea47..0c50b54 100644 --- a/Modules/dbmmodule.c +++ b/Modules/dbmmodule.c @@ -21,6 +21,9 @@ static char *which_dbm = "GNU gdbm"; /* EMX port of GDBM */ #elif defined(HAVE_GDBM_NDBM_H) #include <gdbm/ndbm.h> static char *which_dbm = "GNU gdbm"; +#elif defined(HAVE_GDBM_DASH_NDBM_H) +#include <gdbm-ndbm.h> +static char *which_dbm = "GNU gdbm"; #elif defined(HAVE_BERKDB_H) #include <db.h> static char *which_dbm = "Berkeley DB"; @@ -1019,8 +1019,20 @@ class PyBuildExt(build_ext): exts.append( Extension('dbm', ['dbmmodule.c'], define_macros=[('HAVE_NDBM_H',None)], libraries = ndbm_libs ) ) - elif (self.compiler.find_library_file(lib_dirs, 'gdbm') - and find_file("gdbm/ndbm.h", inc_dirs, []) is not None): + elif self.compiler.find_library_file(lib_dirs, 'gdbm'): + gdbm_libs = ['gdbm'] + if self.compiler.find_library_file(lib_dirs, 'gdbm_compat'): + gdbm_libs.append('gdbm_compat') + if find_file("gdbm/ndbm.h", inc_dirs, []) is not None: + exts.append( Extension( + 'dbm', ['dbmmodule.c'], + define_macros=[('HAVE_GDBM_NDBM_H',None)], + libraries = gdbm_libs ) ) + elif find_file("gdbm-ndbm.h", inc_dirs, []) is not None: + exts.append( Extension( + 'dbm', ['dbmmodule.c'], + define_macros=[('HAVE_GDBM_DASH_NDBM_H',None)], + libraries = gdbm_libs ) ) exts.append( Extension('dbm', ['dbmmodule.c'], define_macros=[('HAVE_GDBM_NDBM_H',None)], libraries = ['gdbm'] ) ) |