From: Nick Coghlan Date: Sun, 17 Jun 2012 08:27:54 +0000 (+1000) Subject: Merge from 3.2. (Issue #15044: Handle Fedora 17's approach to ndbm compatibility) X-Git-Tag: v3.3.0b1~211 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b3eb0dbac9fa3c56176bb9d42b69a97034ccd05;p=python Merge from 3.2. (Issue #15044: Handle Fedora 17's approach to ndbm compatibility) --- 2b3eb0dbac9fa3c56176bb9d42b69a97034ccd05 diff --cc setup.py index 5bc5afe42f,2539f50fa8..31037520c8 --- a/setup.py +++ b/setup.py @@@ -1089,9 -1082,12 +1090,12 @@@ class PyBuildExt(build_ext) if self.compiler.find_library_file(lib_dirs, 'ndbm'): ndbm_libs = ['ndbm'] + elif self.compiler.find_library_file(lib_dirs, + 'gdbm_compat'): + ndbm_libs = ['gdbm_compat'] else: ndbm_libs = [] - print("building dbm using ndbm") + if dbm_setup_debug: print("building dbm using ndbm") dbmext = Extension('_dbm', ['_dbmmodule.c'], define_macros=[ ('HAVE_NDBM_H',None),