Don't try to use unsupported DB versions.

diff --git a/Modules/Setup.dist b/Modules/Setup.dist
index b4635cc2fbf2c906e2705504a56fecb672c27b32..d24fef428e2a983ee0ce90d197559ad3fa207206 100644 (file)
--- a/Modules/Setup.dist
+++ b/Modules/Setup.dist
@@ -396,7 +396,12 @@ GLHACK=-Dclear=__GLclear
 # Sleepycat Berkeley DB interface.
 #
 # This requires the Sleepycat DB code, see http://www.sleepycat.com/
-# The minimum supported version of that library is 3.0.
+# The earliest supported version of that library is 3.0, the latest
+# supported version is 4.0 (4.1 is specifically not supported, as that
+# changes the semantics of transactional databases). A list of available
+# releases can be found at
+#
+# http://www.sleepycat.com/update/index.html
 #
 # Edit the variables DB and DBLIBVERto point to the db top directory
 # and the subdirectory of PORT where you built it.

diff --git a/setup.py b/setup.py
index c94df0b25d5630a520d0aac9343e4ea96f253e1c..f471c03b243563f5d6ebadb1e241f2659458b03d 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -439,21 +439,15 @@ class PyBuildExt(build_ext):
         # when sorted in reverse order, keys for this dict must appear in the
         # order you wish to search - e.g., search for db4 before db3
         db_try_this = {
-            'db4': {'libs': ('db-4.3', 'db-4.2', 'db-4.1', 'db-4.0'),
-                    'libdirs': ('/usr/local/BerkeleyDB.4.3/lib',
-                                '/usr/local/BerkeleyDB.4.2/lib',
-                                '/usr/local/BerkeleyDB.4.1/lib',
-                                '/usr/local/BerkeleyDB.4.0/lib',
+            'db4': {'libs': ('db-4.0',),
+                    'libdirs': ('/usr/local/BerkeleyDB.4.0/lib',
                                 '/usr/local/lib',
                                 '/usr/lib',
                                 '/opt/sfw',
                                 '/sw/lib',
                                 '/lib',
                                 ),
-                    'incdirs': ('/usr/local/BerkeleyDB.4.3/include',
-                                '/usr/local/BerkeleyDB.4.2/include',
-                                '/usr/local/BerkeleyDB.4.1/include',
-                                '/usr/local/BerkeleyDB.4.0/include',
+                    'incdirs': ('/usr/local/BerkeleyDB.4.0/include',
                                 '/usr/local/include/db4',
                                 '/opt/sfw/include/db4',
                                 '/sw/include/db4',