- Added support for linking the bsddb module against BerkeleyDB 4.6.x.

diff --git a/Misc/NEWS b/Misc/NEWS
index 9b9d73f7a960dc765e33cf60cb5c5eac1b4c16c8..c2e9a86fdcad012c436bda5fedb7e9869fc77af7 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -103,6 +103,8 @@ Extension Modules
 - Bug #1726026: Correct the field names of WIN32_FIND_DATAA and
   WIN32_FIND_DATAW structures in the ctypes.wintypes module.
 
+- Added support for linking the bsddb module against BerkeleyDB 4.6.x.
+
 Documentation
 -------------
 

diff --git a/setup.py b/setup.py
index 65b32ea271b506827cf285f6440221610b930830..da662eb1f2fe72f6ae2ca4b5b3be9065b8516de9 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -607,7 +607,7 @@ class PyBuildExt(build_ext):
         # a release.  Most open source OSes come with one or more
         # versions of BerkeleyDB already installed.
 
-        max_db_ver = (4, 5)
+        max_db_ver = (4, 6)
         min_db_ver = (3, 3)
         db_setup_debug = False   # verbose debug prints from this script?
 
@@ -624,7 +624,7 @@ class PyBuildExt(build_ext):
             '/sw/include/db3',
         ]
         # 4.x minor number specific paths
-        for x in (0,1,2,3,4,5):
+        for x in (0,1,2,3,4,5,6):
             db_inc_paths.append('/usr/include/db4%d' % x)
             db_inc_paths.append('/usr/include/db4.%d' % x)
             db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
@@ -647,7 +647,7 @@ class PyBuildExt(build_ext):
         for dn in inc_dirs:
             std_variants.append(os.path.join(dn, 'db3'))
             std_variants.append(os.path.join(dn, 'db4'))
-            for x in (0,1,2,3,4):
+            for x in (0,1,2,3,4,5,6):
                 std_variants.append(os.path.join(dn, "db4%d"%x))
                 std_variants.append(os.path.join(dn, "db4.%d"%x))
             for x in (2,3):