[Python-checkins] CVS: python/dist/src/Modules Setup.config.in,1.6,1.7 Setup.dist,1.6,1.7

[Barry Warsaw]

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv1446/Modules

Modified Files:
	Setup.config.in Setup.dist 
Log Message:
Committing patch #103216, autodetect of dbmmodule support and building
of dbmmodule dynamically by default (otherwise it can pull in
dependencies with libdb that croak pybsddb3).  This change moves the
Setup line for dbmmodule to Setup.config.in.


Index: Setup.config.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/Setup.config.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Setup.config.in	2001/01/10 18:53:48	1.6
--- Setup.config.in	2001/01/15 17:07:21	1.7
***************
*** 23,24 ****
--- 23,27 ----
  # bsddb module enabled by --with-libdb or presence of db.h
  @USE_BSDDB_MODULE@bsddb bsddbmodule.c @HAVE_LIBDB@
+ 
+ # dbm(3) may require -lndbm or similar
+ @USE_DBM_MODULE@dbm dbmmodule.c @HAVE_LIBNDBM@

Index: Setup.dist
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/Setup.dist,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Setup.dist	2001/01/11 14:46:40	1.6
--- Setup.dist	2001/01/15 17:07:21	1.7
***************
*** 356,360 ****
  # similar functionality (but slower of course) implemented in Python.
  
! # The standard Unix dbm module:
  
  #dbm dbmmodule.c 	# dbm(3) may require -lndbm or similar
--- 356,363 ----
  # similar functionality (but slower of course) implemented in Python.
  
! # The standard Unix dbm module has been moved to Setup.config so that
! # it will be compiled as a shared library by default.  Compiling it as
! # a built-in module causes conflicts with the pybsddb3 module since it
! # creates a static dependency on an out-of-date version of db.so.
  
  #dbm dbmmodule.c 	# dbm(3) may require -lndbm or similar