Add BerkeleyDB 4.2 library to the bsddb module search path

(backport 1.173)

diff --git a/setup.py b/setup.py
index 25d76079ad22ea8167fa89988b0c021c645f2911..3fec4f7770dbe73ca8dd605fb8ada4b6a01905ab 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -468,22 +468,29 @@ class PyBuildExt(build_ext):
         # Sleepycat Berkeley DB interface.  http://www.sleepycat.com
         #
         # This requires the Sleepycat DB code. The earliest supported version
-        # of that library is 3.0, the latest supported version is 4.1.  A list
+        # of that library is 3.1, the latest supported version is 4.2.  A list
         # of available releases can be found at
         #
         # http://www.sleepycat.com/update/index.html
+        #
+        # NOTE: 3.1 is only partially supported; expect the extended bsddb module
+        # test suite to show failures due to some missing methods and behaviours
+        # in BerkeleyDB 3.1.
 
         # 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.1', 'db41', 'db-4.0', 'db4',),
-                    'libdirs': ('/usr/local/BerkeleyDB.4.1/lib',
+            'db4': {'libs': ('db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
+                    'libdirs': ('/usr/local/BerkeleyDB.4.2/lib',
+                                '/usr/local/BerkeleyDB.4.1/lib',
                                 '/usr/local/BerkeleyDB.4.0/lib',
                                 '/usr/local/lib',
                                 '/opt/sfw',
                                 '/sw/lib',
                                 ),
-                    'incdirs': ('/usr/local/BerkeleyDB.4.1/include',
+                    'incdirs': ('/usr/local/BerkeleyDB.4.2/include',
+                                '/usr/local/include/db42',
+                                '/usr/local/BerkeleyDB.4.1/include',
                                 '/usr/local/include/db41',
                                 '/usr/local/BerkeleyDB.4.0/include',
                                 '/usr/local/include/db4',