From: Matthias Klose <doko@ubuntu.com>
Date: Mon, 3 Sep 2007 23:33:04 +0000 (+0000)
Subject: - Added support for linking the bsddb module against BerkeleyDB 4.6.x.
X-Git-Tag: v2.6a1~1353
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=691632f14d4c9ebf0703ccbf7aa9f37ca8df982d;p=python

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

diff --git a/Misc/NEWS b/Misc/NEWS
index 05520aa389..2cfc4cef5a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -838,7 +838,8 @@ Extension Modules
 - fixed a bug with bsddb.DB.stat: the flags and txn keyword arguments
   were transposed.
 
-- Added support for linking the bsddb module against BerkeleyDB 4.5.x.
+- Added support for linking the bsddb module against BerkeleyDB 4.5.x
+  and 4.6.x.
 
 - Bug #1633621: if curses.resizeterm() or curses.resize_term() is called,
   update _curses.LINES, _curses.COLS, curses.LINES and curses.COLS.
diff --git a/setup.py b/setup.py
index 7a0288414f..11c6fa3fa0 100644
--- a/setup.py
+++ b/setup.py
@@ -666,7 +666,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?
 
@@ -684,7 +684,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)
@@ -709,7 +709,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):