[Python-checkins] python/dist/src setup.py,1.115,1.116

[loewis@users.sourceforge.net]

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

Modified Files:
	setup.py 
Log Message:
Import PyBSDDB 3.4.0. Rename historical wrapper to bsddb185.


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** setup.py	9 Nov 2002 19:53:04 -0000	1.115
--- setup.py	19 Nov 2002 08:09:50 -0000	1.116
***************
*** 438,443 ****
  
          # when sorted in reverse order, keys for this dict must appear in the
!         # order you wish to search - e.g., search for db3 before db2, db2
!         # before db1
          db_try_this = {
              'db4': {'libs': ('db-4.3', 'db-4.2', 'db-4.1', 'db-4.0'),
--- 438,442 ----
  
          # 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.3', 'db-4.2', 'db-4.1', 'db-4.0'),
***************
*** 461,465 ****
                                  '/usr/include/db4',
                                  ),
!                     'incs': ('db_185.h',)},
              'db3': {'libs': ('db-3.3', 'db-3.2', 'db-3.1', 'db-3.0'),
                      'libdirs': ('/usr/local/BerkeleyDB.3.3/lib',
--- 460,464 ----
                                  '/usr/include/db4',
                                  ),
!                     'incs': ('db.h',)},
              'db3': {'libs': ('db-3.3', 'db-3.2', 'db-3.1', 'db-3.0'),
                      'libdirs': ('/usr/local/BerkeleyDB.3.3/lib',
***************
*** 482,514 ****
                                  '/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',)},
              }
  
-         # override this list to affect the library version search order
-         # for example, if you want to force version 2 to be used:
-         #   db_search_order = ["db2"]
          db_search_order = db_try_this.keys()
          db_search_order.sort()
--- 481,487 ----
                                  '/usr/include/db3',
                                  ),
!                     'incs': ('db.h',)},
              }
  
          db_search_order = db_try_this.keys()
          db_search_order.sort()
***************
*** 538,554 ****
              # in some unusual system configurations (e.g. the directory is on
              # an NFS server that goes away).
!             if dbinc == 'db_185.h':
!                 exts.append(Extension('bsddb', ['bsddbmodule.c'],
!                                       library_dirs=[dblib_dir],
!                                       runtime_library_dirs=[dblib_dir],
!                                       include_dirs=db_incs,
!                                       define_macros=[('HAVE_DB_185_H',1)],
!                                       libraries=dblibs))
!             else:
!                 exts.append(Extension('bsddb', ['bsddbmodule.c'],
!                                       library_dirs=[dblib_dir],
!                                       runtime_library_dirs=[dblib_dir],
!                                       include_dirs=db_incs,
!                                       libraries=dblibs))
          else:
              db_incs = None
--- 511,519 ----
              # in some unusual system configurations (e.g. the directory is on
              # an NFS server that goes away).
!             exts.append(Extension('_bsddb', ['_bsddb.c'],
!                                   library_dirs=[dblib_dir],
!                                   runtime_library_dirs=[dblib_dir],
!                                   include_dirs=db_incs,
!                                   libraries=dblibs))
          else:
              db_incs = None