From c1ce286061d02b8e3701633dd22c3ce813f9a6f6 Mon Sep 17 00:00:00 2001 From: Skip Montanaro Date: Sat, 6 Dec 2008 17:25:02 +0000 Subject: issue 4483 - _dbm build failures on systems with gdbm_compat lib. --- setup.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index d2931d1692..d6d9c97e7b 100644 --- a/setup.py +++ b/setup.py @@ -783,11 +783,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): - exts.append( Extension('_dbm', ['_dbmmodule.c'], - define_macros=[('HAVE_GDBM_NDBM_H',None)], - libraries = ['gdbm'] ) ) + 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 ) ) elif db_incs is not None: exts.append( Extension('_dbm', ['_dbmmodule.c'], library_dirs=dblib_dir, -- cgit v1.2.1