[Python-checkins] python/dist/src setup.py,1.170,1.171

aimacintyre@users.sourceforge.net aimacintyre@users.sourceforge.net
Thu, 10 Jul 2003 05:48:42 -0700


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

Modified Files:
	setup.py 
Log Message:
patch #764612 - find DB 4.1/4.0/3.x on FreeBSD and systems with similar
installation location policies.


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.170
retrieving revision 1.171
diff -C2 -d -r1.170 -r1.171
*** setup.py	17 Jun 2003 02:51:28 -0000	1.170
--- setup.py	10 Jul 2003 12:48:39 -0000	1.171
***************
*** 477,481 ****
          # 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',
--- 477,481 ----
          # 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',
***************
*** 485,488 ****
--- 485,489 ----
                                  ),
                      'incdirs': ('/usr/local/BerkeleyDB.4.1/include',
+                                 '/usr/local/include/db41',
                                  '/usr/local/BerkeleyDB.4.0/include',
                                  '/usr/local/include/db4',
***************
*** 491,495 ****
                                  '/usr/include/db4',
                                  )},
!             'db3': {'libs': ('db-3.3', 'db-3.2', 'db-3.1'),
                      'libdirs': ('/usr/local/BerkeleyDB.3.3/lib',
                                  '/usr/local/BerkeleyDB.3.2/lib',
--- 492,496 ----
                                  '/usr/include/db4',
                                  )},
!             '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',