Update of /cvsroot/python/python/dist/src In directory sc8-pr-cvs1:/tmp/cvs-serv26052 Modified Files: Tag: release23-maint setup.py Log Message: Add BerkeleyDB 4.2 library to the bsddb module search path (backport 1.173) Index: setup.py =================================================================== RCS file: /cvsroot/python/python/dist/src/setup.py,v retrieving revision 1.171 retrieving revision 1.171.6.1 diff -C2 -d -r1.171 -r1.171.6.1 *** setup.py 10 Jul 2003 12:48:39 -0000 1.171 --- setup.py 22 Sep 2003 01:19:45 -0000 1.171.6.1 *************** *** 469,482 **** # # 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 available releases can be found at # # http://www.sleepycat.com/update/index.html # 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', '/usr/local/BerkeleyDB.4.0/lib', '/usr/local/lib', --- 469,487 ---- # # This requires the Sleepycat DB code. The earliest supported version ! # 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.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', *************** *** 484,488 **** '/sw/lib', ), ! 'incdirs': ('/usr/local/BerkeleyDB.4.1/include', '/usr/local/include/db41', '/usr/local/BerkeleyDB.4.0/include', --- 489,495 ---- '/sw/lib', ), ! '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',