[Python-checkins] python/dist/src setup.py,1.107,1.108
montanaro@users.sourceforge.net
montanaro@users.sourceforge.net
Wed, 14 Aug 2002 18:34:40 -0700
Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv25138
Modified Files:
setup.py
Log Message:
Slight reordering of directories searched for BerkDB libs and include files.
Push /usr/... further down the list - always check /usr/local/... before
/usr/...
Doubt this will help with http://python.org/sf/589427 or not, but these
changes were prompted by my investigation of that bug report. I wasn't able
to reproduce that problem though
Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** setup.py 14 Aug 2002 11:13:52 -0000 1.107
--- setup.py 15 Aug 2002 01:34:38 -0000 1.108
***************
*** 443,446 ****
--- 443,447 ----
'/usr/local/BerkeleyDB.4.1/lib',
'/usr/local/BerkeleyDB.4.0/lib',
+ '/usr/local/lib',
'/usr/lib',
'/opt/sfw',
***************
*** 452,459 ****
'/usr/local/BerkeleyDB.4.1/include',
'/usr/local/BerkeleyDB.4.0/include',
! '/usr/include/db3',
'/opt/sfw/include/db3',
'/sw/include/db3',
! '/usr/local/include/db3',
),
'incs': ('db_185.h',)},
--- 453,460 ----
'/usr/local/BerkeleyDB.4.1/include',
'/usr/local/BerkeleyDB.4.0/include',
! '/usr/local/include/db3',
'/opt/sfw/include/db3',
'/sw/include/db3',
! '/usr/include/db3',
),
'incs': ('db_185.h',)},
***************
*** 463,469 ****
'/usr/local/BerkeleyDB.3.1/lib',
'/usr/local/BerkeleyDB.3.0/lib',
! '/usr/lib',
'/opt/sfw',
'/sw/lib',
'/lib',
),
--- 464,471 ----
'/usr/local/BerkeleyDB.3.1/lib',
'/usr/local/BerkeleyDB.3.0/lib',
! '/usr/local/lib',
'/opt/sfw',
'/sw/lib',
+ '/usr/lib',
'/lib',
),
***************
*** 472,494 ****
'/usr/local/BerkeleyDB.3.1/include',
'/usr/local/BerkeleyDB.3.0/include',
! '/usr/include/db3',
'/opt/sfw/include/db3',
'/sw/include/db3',
! '/usr/local/include/db3',
),
'incs': ('db_185.h',)},
'db2': {'libs': ('db2',),
! 'libdirs': ('/usr/lib', '/sw/lib', '/lib'),
! 'incdirs': ('/usr/include/db2',
! '/usr/local/include/db2', '/sw/include/db2'),
'incs': ('db_185.h',)},
# if you are willing to risk hash db file corruption you can
# uncomment the lines below for db1. Note that this will affect
# not only the bsddb module, but the dbhash and anydbm modules
! # as well. you have been warned!!!
##'db1': {'libs': ('db1', 'db'),
! ## 'libdirs': ('/usr/lib', '/sw/lib', '/lib'),
! ## 'incdirs': ('/usr/include/db1', '/usr/local/include/db1',
! ## '/usr/include', '/usr/local/include'),
## 'incs': ('db.h',)},
}
--- 474,505 ----
'/usr/local/BerkeleyDB.3.1/include',
'/usr/local/BerkeleyDB.3.0/include',
! '/usr/local/include/db3',
'/opt/sfw/include/db3',
'/sw/include/db3',
! '/usr/include/db3',
),
'incs': ('db_185.h',)},
'db2': {'libs': ('db2',),
! 'libdirs': ('/usr/local/lib',
! '/sw/lib',
! '/usr/lib',
! '/lib'),
! 'incdirs': ('/usr/local/include/db2',
! '/sw/include/db2',
! '/usr/include/db2'),
'incs': ('db_185.h',)},
# if you are willing to risk hash db file corruption you can
# uncomment the lines below for db1. Note that this will affect
# not only the bsddb module, but the dbhash and anydbm modules
! # as well. YOU HAVE BEEN WARNED!!!
##'db1': {'libs': ('db1', 'db'),
! ## 'libdirs': ('/usr/local/lib',
! ## '/sw/lib',
! ## '/usr/lib',
! ## '/lib'),
! ## 'incdirs': ('/usr/local/include/db1',
! ## '/usr/local/include',
! ## '/usr/include/db1',
! ## '/usr/include'),
## 'incs': ('db.h',)},
}