[Python-checkins] r67612 - in python/branches/py3k: Misc/NEWS Modules/_dbmmodule.c setup.py

Sat Dec 6 18:25:02 CET 2008

Author: skip.montanaro
Date: Sat Dec 6 18:25:02 2008
New Revision: 67612
Log:
issue 4483 - _dbm build failures on systems with gdbm_compat lib.
Modified:
 python/branches/py3k/Misc/NEWS
 python/branches/py3k/Modules/_dbmmodule.c
 python/branches/py3k/setup.py
Modified: python/branches/py3k/Misc/NEWS
==============================================================================

--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sat Dec 6 18:25:02 2008
@@ -25,6 +25,9 @@
 Library
 -------
 
+- Issue #4483: _dbm module now builds on systems with gdbm & gdbm_compat
+ libs.
+
 - Issue #4542: On Windows, binascii.crc32 still accepted str as binary input;
 the corresponding tests now pass.
 
Modified: python/branches/py3k/Modules/_dbmmodule.c
==============================================================================
--- python/branches/py3k/Modules/_dbmmodule.c	(original)
+++ python/branches/py3k/Modules/_dbmmodule.c	Sat Dec 6 18:25:02 2008
@@ -21,6 +21,9 @@
 #elif defined(HAVE_GDBM_NDBM_H)
 #include <gdbm/ndbm.h>
 static char *which_dbm = "GNU gdbm";
+#elif defined(HAVE_GDBM_DASH_NDBM_H)
+#include <gdbm-ndbm.h>
+static char *which_dbm = "GNU gdbm";
 #elif defined(HAVE_BERKDB_H)
 #include <db.h>
 static char *which_dbm = "Berkeley DB";
Modified: python/branches/py3k/setup.py
==============================================================================
--- python/branches/py3k/setup.py	(original)
+++ python/branches/py3k/setup.py	Sat Dec 6 18:25:02 2008
@@ -783,11 +783,20 @@
 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,
