[Python-checkins] r57935 - in python/branches/release25-maint: Misc/NEWS setup.py

[matthias.klose]

Author: matthias.klose
Date: Tue Sep  4 00:13:48 2007
New Revision: 57935

Modified:
   python/branches/release25-maint/Misc/NEWS
   python/branches/release25-maint/setup.py
Log:
- Added support for linking the bsddb module against BerkeleyDB 4.6.x.


Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Tue Sep  4 00:13:48 2007
@@ -103,6 +103,8 @@
 - 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
 -------------
 

Modified: python/branches/release25-maint/setup.py
==============================================================================
--- python/branches/release25-maint/setup.py	(original)
+++ python/branches/release25-maint/setup.py	Tue Sep  4 00:13:48 2007
@@ -607,7 +607,7 @@
         # 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 @@
             '/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 @@
         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):