[Python-checkins] cpython (merge 3.2 -> default): Merge from 3.2. (Issue #15044: Handle Fedora 17's approach to ndbm

[nick.coghlan]

http://hg.python.org/cpython/rev/1f6c23ed8218
changeset:   77482:1f6c23ed8218
parent:      77480:afe67ea94bc6
parent:      77481:e2be1f43beed
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Sun Jun 17 18:27:54 2012 +1000
summary:
  Merge from 3.2. (Issue #15044: Handle Fedora 17's approach to ndbm compatibility)

files:
  setup.py |  6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1085,10 +1085,14 @@
             for cand in dbm_order:
                 if cand == "ndbm":
                     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,
                                                                'ndbm'):
                             ndbm_libs = ['ndbm']
+                        elif self.compiler.find_library_file(lib_dirs,
+                                                             'gdbm_compat'):
+                            ndbm_libs = ['gdbm_compat']
                         else:
                             ndbm_libs = []
                         if dbm_setup_debug: print("building dbm using ndbm")

-- 
Repository URL: http://hg.python.org/cpython