summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew MacIntyre <andymac@bullseye.apana.org.au>2003-07-10 12:48:39 (GMT)
committerAndrew MacIntyre <andymac@bullseye.apana.org.au>2003-07-10 12:48:39 (GMT)
commit28df64ac472862ce0f03f932407e71a35ce61f19 (patch)
treea0312cd4cd0d732bd96a904ef60b08c65e19070e
parent931237e2e66975c54e2ac6c5e503ee2992a22bcf (diff)
downloadcpython-28df64ac472862ce0f03f932407e71a35ce61f19.zip
cpython-28df64ac472862ce0f03f932407e71a35ce61f19.tar.gz
cpython-28df64ac472862ce0f03f932407e71a35ce61f19.tar.bz2
patch #764612 - find DB 4.1/4.0/3.x on FreeBSD and systems with similar
installation location policies.
-rw-r--r--setup.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index 99e5d80..25d7607 100644
--- a/setup.py
+++ b/setup.py
@@ -476,7 +476,7 @@ 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.1', 'db-4.0',),
+ 'db4': {'libs': ('db-4.1', 'db41', 'db-4.0', 'db4',),
'libdirs': ('/usr/local/BerkeleyDB.4.1/lib',
'/usr/local/BerkeleyDB.4.0/lib',
'/usr/local/lib',
@@ -484,13 +484,14 @@ class PyBuildExt(build_ext):
'/sw/lib',
),
'incdirs': ('/usr/local/BerkeleyDB.4.1/include',
+ '/usr/local/include/db41',
'/usr/local/BerkeleyDB.4.0/include',
'/usr/local/include/db4',
'/opt/sfw/include/db4',
'/sw/include/db4',
'/usr/include/db4',
)},
- 'db3': {'libs': ('db-3.3', 'db-3.2', 'db-3.1'),
+ 'db3': {'libs': ('db-3.3', 'db-3.2', 'db-3.1', 'db3',),
'libdirs': ('/usr/local/BerkeleyDB.3.3/lib',
'/usr/local/BerkeleyDB.3.2/lib',
'/usr/local/BerkeleyDB.3.1/lib',