[Python-checkins] python/dist/src setup.py,1.122,1.123

[loewis@users.sourceforge.net]

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

Modified Files:
	setup.py 
Log Message:
Correct db3 /opt/sfw library path. Link ndbm with libc only if ndbm.h
is present and libndbm is not. Add runtime libs to dbm if linked against
Berkeley DB.


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** setup.py	6 Dec 2002 10:25:02 -0000	1.122
--- setup.py	7 Dec 2002 14:41:17 -0000	1.123
***************
*** 477,481 ****
                                  '/usr/local/BerkeleyDB.3.0/lib',
                                  '/usr/local/lib',
!                                 '/opt/sfw',
                                  '/sw/lib',
                                  ),
--- 477,481 ----
                                  '/usr/local/BerkeleyDB.3.0/lib',
                                  '/usr/local/lib',
!                                 '/opt/sfw/lib',
                                  '/sw/lib',
                                  ),
***************
*** 543,556 ****
          # The standard Unix dbm module:
          if platform not in ['cygwin']:
!             if (self.compiler.find_library_file(lib_dirs, 'ndbm')
!                 and find_file("ndbm.h", inc_dirs, []) is not None):
                  exts.append( Extension('dbm', ['dbmmodule.c'],
                                         define_macros=[('HAVE_NDBM_H',None)],
!                                        libraries = ['ndbm'] ) )
!             elif (platform in ['darwin']
!                 and find_file("ndbm.h", inc_dirs, []) is not None):
!                 # Darwin has ndbm in libc
!                 exts.append( Extension('dbm', ['dbmmodule.c'],
!                                        define_macros=[('HAVE_NDBM_H',None)]) )
              elif (self.compiler.find_library_file(lib_dirs, 'gdbm')
                    and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
--- 543,555 ----
          # The standard Unix dbm module:
          if platform not in ['cygwin']:
!             if find_file("ndbm.h", inc_dirs, []) is not None:
!                 # Some systems have -lndbm, others don't
!                 if self.compiler.find_library_file(lib_dirs, 'ndbm'):
!                     ndbm_libs = ['ndbm']
!                 else:
!                     ndbm_libs = []
                  exts.append( Extension('dbm', ['dbmmodule.c'],
                                         define_macros=[('HAVE_NDBM_H',None)],
!                                        libraries = ndbm_libs ) )
              elif (self.compiler.find_library_file(lib_dirs, 'gdbm')
                    and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
***************
*** 560,564 ****
              elif db_incs is not None:
                  exts.append( Extension('dbm', ['dbmmodule.c'],
!                                        library_dirs=[dblib_dir],
                                         include_dirs=db_incs,
                                         define_macros=[('HAVE_BERKDB_H',None),
--- 559,564 ----
              elif db_incs is not None:
                  exts.append( Extension('dbm', ['dbmmodule.c'],
!                                        library_dirs=dblib_dir,
!                                        runtime_library_dirs=dblib_dir,
                                         include_dirs=db_incs,
                                         define_macros=[('HAVE_BERKDB_H',None),