[Python-checkins] python/dist/src setup.py,1.129,1.130

[bwarsaw@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31946

Modified Files:
	setup.py 
Log Message:
Search for and use BerkeleyDB 4.1 if it's available.  Python's
extension module now supports it.


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.129
retrieving revision 1.130
diff -C2 -d -r1.129 -r1.130
*** setup.py	29 Dec 2002 23:03:38 -0000	1.129
--- setup.py	30 Dec 2002 20:51:12 -0000	1.130
***************
*** 450,461 ****
          # similar functionality (but slower of course) implemented in Python.
  
!         # Sleepycat Berkeley DB interface.
          #
!         # This requires the Sleepycat DB code, see
!         # http://www.sleepycat.com/ The earliest supported version of
!         # that library is 3.0, the latest supported version is 4.0
!         # (4.1 is specifically not supported, as that changes the
!         # semantics of transactional databases). A list of available
!         # releases can be found at
          #
          # http://www.sleepycat.com/update/index.html
--- 450,458 ----
          # similar functionality (but slower of course) implemented in Python.
  
!         # 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 available releases can be found at
          #
          # http://www.sleepycat.com/update/index.html
***************
*** 464,474 ****
          # order you wish to search - e.g., search for db4 before db3
          db_try_this = {
!             'db4': {'libs': ('db-4.0',),
!                     'libdirs': ('/usr/local/BerkeleyDB.4.0/lib',
                                  '/usr/local/lib',
                                  '/opt/sfw',
                                  '/sw/lib',
                                  ),
!                     'incdirs': ('/usr/local/BerkeleyDB.4.0/include',
                                  '/usr/local/include/db4',
                                  '/opt/sfw/include/db4',
--- 461,473 ----
          # order you wish to search - e.g., search for db4 before db3
          db_try_this = {
!             'db4': {'libs': ('db-4.1', 'db-4.0',),
!                     'libdirs': ('/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',
!                                 '/usr/local/BerkeleyDB.4.0/include',
                                  '/usr/local/include/db4',
                                  '/opt/sfw/include/db4',