]> granicus.if.org Git - python/commitdiff
Merge from 3.2. (Issue #15044: Handle Fedora 17's approach to ndbm compatibility)
authorNick Coghlan <ncoghlan@gmail.com>
Sun, 17 Jun 2012 08:27:54 +0000 (18:27 +1000)
committerNick Coghlan <ncoghlan@gmail.com>
Sun, 17 Jun 2012 08:27:54 +0000 (18:27 +1000)
1  2 
setup.py

diff --cc setup.py
index 5bc5afe42f4cd7dee62d1f30f7c990d04a357766,2539f50fa8efede409f6851ee5cddd4798bcfd75..31037520c812fef711ccf1f700181fe81a793ebc
+++ 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),