summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory P. Smith <greg@mad-scientist.com>2004-12-13 09:57:32 (GMT)
committerGregory P. Smith <greg@mad-scientist.com>2004-12-13 09:57:32 (GMT)
commit7af53a6de429ef7501f860e3cc2a085c378bcef9 (patch)
tree8d1e5fdd577d5e87e7c948ef12838c184de3f635
parent8b7e917ab2865f86d09515b8d098950aece0e14c (diff)
downloadcpython-7af53a6de429ef7501f860e3cc2a085c378bcef9.zip
cpython-7af53a6de429ef7501f860e3cc2a085c378bcef9.tar.gz
cpython-7af53a6de429ef7501f860e3cc2a085c378bcef9.tar.bz2
the bsddb module now also works with BerkeleyDB 4.3.
-rw-r--r--Doc/lib/libbsddb.tex2
-rw-r--r--setup.py11
2 files changed, 8 insertions, 5 deletions
diff --git a/Doc/lib/libbsddb.tex b/Doc/lib/libbsddb.tex
index a25d39b..b597958 100644
--- a/Doc/lib/libbsddb.tex
+++ b/Doc/lib/libbsddb.tex
@@ -16,7 +16,7 @@ serialize them somehow, typically using marshal.dumps or pickle.dumps.
Starting with Python 2.3 the \module{bsddb} module requires the
Berkeley DB library version 3.2 or later (it is known to work with 3.2
-thru 4.2 at the time of this writing).
+thru 4.3 at the time of this writing).
\begin{seealso}
\seeurl{http://pybsddb.sourceforge.net/}{Website with documentation
diff --git a/setup.py b/setup.py
index 807cd59..16448c6 100644
--- a/setup.py
+++ b/setup.py
@@ -492,7 +492,7 @@ 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.2, the latest supported version is 4.2. A list
+ # of that library is 3.2, the latest supported version is 4.3. A list
# of available releases can be found at
#
# http://www.sleepycat.com/update/index.html
@@ -500,15 +500,18 @@ 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.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
- 'libdirs': ('/usr/local/BerkeleyDB.4.2/lib',
+ 'db4': {'libs': ('db-4.3', 'db43', 'db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
+ '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',
'/usr/local/lib',
'/opt/sfw',
'/sw/lib',
),
- 'incdirs': ('/usr/local/BerkeleyDB.4.2/include',
+ 'incdirs': ('/usr/local/BerkeleyDB.4.3/include',
+ '/usr/local/include/db43',
+ '/usr/local/BerkeleyDB.4.2/include',
'/usr/local/include/db42',
'/usr/local/BerkeleyDB.4.1/include',
'/usr/local/include/db41',