Merge from 3.2. (Issue #15044: Handle Fedora 17's approach to ndbm compatibility)
This commit is contained in:
commit
2b3eb0dbac
6
setup.py
6
setup.py
|
@ -1085,10 +1085,14 @@ class PyBuildExt(build_ext):
|
||||||
for cand in dbm_order:
|
for cand in dbm_order:
|
||||||
if cand == "ndbm":
|
if cand == "ndbm":
|
||||||
if find_file("ndbm.h", inc_dirs, []) is not None:
|
if find_file("ndbm.h", inc_dirs, []) is not None:
|
||||||
# Some systems have -lndbm, others don't
|
# Some systems have -lndbm, others have -lgdbm_compat,
|
||||||
|
# others don't have either
|
||||||
if self.compiler.find_library_file(lib_dirs,
|
if self.compiler.find_library_file(lib_dirs,
|
||||||
'ndbm'):
|
'ndbm'):
|
||||||
ndbm_libs = ['ndbm']
|
ndbm_libs = ['ndbm']
|
||||||
|
elif self.compiler.find_library_file(lib_dirs,
|
||||||
|
'gdbm_compat'):
|
||||||
|
ndbm_libs = ['gdbm_compat']
|
||||||
else:
|
else:
|
||||||
ndbm_libs = []
|
ndbm_libs = []
|
||||||
if dbm_setup_debug: print("building dbm using ndbm")
|
if dbm_setup_debug: print("building dbm using ndbm")
|
||||||
|
|
Loading…
Reference in New Issue