[Python-checkins] CVS: python/dist/src/Modules Setup.config.in,1.2,1.3 Setup.in,1.108,1.109 bsddbmodule.c,1.23,1.24

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv7894/Modules

Modified Files:
	Setup.config.in Setup.in bsddbmodule.c 
Log Message:

Skip Montanaro <skip@mojam.com>:
Update the build structures to automatically detect the presence of BSD db,
including the proper name of the header file to include.  Has all the
expected niceties associated with yet-more-configure-options.  ;)

This checkin includes changes for non-generated files only; subsequent
checkin will catch those.

This is part of SourceForge patch #101272.


Index: Setup.config.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/Setup.config.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Setup.config.in	2000/08/26 11:34:29	1.2
--- Setup.config.in	2000/08/31 16:11:07	1.3
***************
*** 9,10 ****
--- 9,19 ----
  # Garbage collection enabled with --with-cycle-gc
  @USE_GC_MODULE@gc gcmodule.c
+ 
+ # You may want this to be built as a dynamically loaded module; uncomment
+ # the following line in that case:
+ 
+ #*shared*
+ 
+ # bsddb module enabled by --with-libdb or presence of db.h
+ @USE_BSDDB_MODULE@bsddb bsddbmodule.c -ldb
+ 

Index: Setup.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/Setup.in,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -r1.108 -r1.109
*** Setup.in	2000/08/24 22:54:53	1.108
--- Setup.in	2000/08/31 16:11:07	1.109
***************
*** 362,365 ****
--- 362,368 ----
  # BSD DB 2.1.0.)
  
+ # Note: If a db.h file is found by configure, bsddb will be enabled
+ # automatically via Setup.config.in
+ 
  #DB=/depot/sundry/src/berkeley-db/db.1.85
  #DBPORT=$(DB)/PORT/irix.5.3

Index: bsddbmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/bsddbmodule.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** bsddbmodule.c	2000/07/24 14:43:34	1.23
--- bsddbmodule.c	2000/08/31 16:11:07	1.24
***************
*** 31,36 ****
  #include <sys/stat.h>
  #include <fcntl.h>
! /* If using Berkeley DB 2.0 or newer, change this include to <db_185.h>: */
  #include <db.h>
  /* Please don't include internal header files of the Berkeley db package
     (it messes up the info required in the Setup file) */
--- 31,39 ----
  #include <sys/stat.h>
  #include <fcntl.h>
! #ifdef HAVE_DB_185_H
! #include <db_185.h>
! #else
  #include <db.h>
+ #endif
  /* Please don't include internal header files of the Berkeley db package
     (it messes up the info required in the Setup file) */