1 --- Python-3.0.1/setup.py.wiget 2009-02-21 20:21:34.000000000 +0100
2 +++ Python-3.0.1/setup.py 2009-02-21 20:25:49.000000000 +0100
3 @@ -776,39 +776,9 @@ class PyBuildExt(build_ext):
5 # The standard Unix dbm module:
6 if platform not in ['cygwin']:
7 - if find_file("ndbm.h", inc_dirs, []) is not None:
8 - # Some systems have -lndbm, others don't
9 - if self.compiler.find_library_file(lib_dirs, 'ndbm'):
10 - ndbm_libs = ['ndbm']
13 - exts.append( Extension('_dbm', ['_dbmmodule.c'],
14 - define_macros=[('HAVE_NDBM_H',None)],
15 - libraries = ndbm_libs ) )
16 - elif self.compiler.find_library_file(lib_dirs, 'gdbm'):
17 - gdbm_libs = ['gdbm']
18 - if self.compiler.find_library_file(lib_dirs, 'gdbm_compat'):
19 - gdbm_libs.append('gdbm_compat')
20 - if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
21 - exts.append( Extension(
22 - '_dbm', ['_dbmmodule.c'],
23 - define_macros=[('HAVE_GDBM_NDBM_H',None)],
24 - libraries = gdbm_libs ) )
25 - elif find_file("gdbm-ndbm.h", inc_dirs, []) is not None:
26 - exts.append( Extension(
27 - '_dbm', ['_dbmmodule.c'],
28 - define_macros=[('HAVE_GDBM_DASH_NDBM_H',None)],
29 - libraries = gdbm_libs ) )
30 - elif db_incs is not None:
31 - exts.append( Extension('_dbm', ['_dbmmodule.c'],
32 - library_dirs=dblib_dir,
33 - runtime_library_dirs=dblib_dir,
34 - include_dirs=db_incs,
35 - define_macros=[('HAVE_BERKDB_H',None),
36 - ('DB_DBM_HSEARCH',None)],
39 - missing.append('_dbm')
40 + exts.append( Extension('_dbm', ['_dbmmodule.c'],
41 + define_macros=[('HAVE_NDBM_H',None)],
42 + libraries = ["gdbm", "gdbm_compat"] ) )
44 # Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm:
45 if (self.compiler.find_library_file(lib_dirs, 'gdbm')):