[Python-checkins] CVS: python/dist/src configure.in,1.156,1.157 configure,1.146,1.147 config.h.in,2.72,2.73

[Fred L. Drake]

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

Modified Files:
	configure.in configure config.h.in 
Log Message:

Allow configure to detect whether ndbm.h or gdbm/ndbm.h is installed.
This allows dbmmodule.c to use either without having to add additional
options to the Modules/Setup file or make source changes.

(At least some Linux systems use gdbm to emulate ndbm, but only install
the ndbm.h header as /usr/include/gdbm/ndbm.h.)


Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.156
retrieving revision 1.157
diff -C2 -r1.156 -r1.157
*** configure.in	2000/09/08 02:17:14	1.156
--- configure.in	2000/09/14 15:47:04	1.157
***************
*** 372,376 ****
  sys/audioio.h sys/file.h sys/lock.h db_185.h db.h \
  sys/param.h sys/select.h sys/socket.h sys/time.h sys/times.h \
! sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h)
  AC_HEADER_DIRENT
  
--- 372,376 ----
  sys/audioio.h sys/file.h sys/lock.h db_185.h db.h \
  sys/param.h sys/select.h sys/socket.h sys/time.h sys/times.h \
! sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h ndbm.h gdbm/ndbm.h)
  AC_HEADER_DIRENT
  

Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -r1.146 -r1.147
*** configure	2000/09/08 02:17:14	1.146
--- configure	2000/09/14 15:47:05	1.147
***************
*** 1,5 ****
  #! /bin/sh
  
! # From configure.in Revision: 1.155 
  
  # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
  #! /bin/sh
  
! # From configure.in Revision: 1.156 
  
  # Guess values for system-dependent variables and create Makefiles.
***************
*** 1543,1547 ****
  sys/audioio.h sys/file.h sys/lock.h db_185.h db.h \
  sys/param.h sys/select.h sys/socket.h sys/time.h sys/times.h \
! sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--- 1543,1547 ----
  sys/audioio.h sys/file.h sys/lock.h db_185.h db.h \
  sys/param.h sys/select.h sys/socket.h sys/time.h sys/times.h \
! sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h ndbm.h gdbm/ndbm.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`

Index: config.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/config.h.in,v
retrieving revision 2.72
retrieving revision 2.73
diff -C2 -r2.72 -r2.73
*** config.h.in	2000/08/31 20:03:54	2.72
--- config.h.in	2000/09/14 15:47:06	2.73
***************
*** 273,279 ****
  #undef SIZEOF_VOID_P
  
- /* Define if you have the _getpty function.  */
- #undef HAVE__GETPTY
- 
  /* Define if you have the alarm function.  */
  #undef HAVE_ALARM
--- 273,276 ----
***************
*** 363,366 ****
--- 360,366 ----
  #undef HAVE_GETPID
  
+ /* Define if you have the _getpty function.  */
+ #undef HAVE__GETPTY
+ 
  /* Define if you have the getpwent function.  */
  #undef HAVE_GETPWENT
***************
*** 522,531 ****
  #undef HAVE_WAITPID
  
- /* Define if you have the <db.h> header file.  */
- #undef HAVE_DB_H
- 
  /* Define if you have the <db_185.h> header file.  */
  #undef HAVE_DB_185_H
  
  /* Define if you have the <dirent.h> header file.  */
  #undef HAVE_DIRENT_H
--- 522,531 ----
  #undef HAVE_WAITPID
  
  /* Define if you have the <db_185.h> header file.  */
  #undef HAVE_DB_185_H
  
+ /* Define if you have the <db.h> header file.  */
+ #undef HAVE_DB_H
+ 
  /* Define if you have the <dirent.h> header file.  */
  #undef HAVE_DIRENT_H
***************
*** 537,540 ****
--- 537,543 ----
  #undef HAVE_FCNTL_H
  
+ /* Define if you have the <gdbm/ndbm.h> header file.  */
+ #undef HAVE_GDBM_NDBM_H
+ 
  /* Define if you have the <libutil.h> header file.  */
  #undef HAVE_LIBUTIL_H
***************
*** 548,551 ****
--- 551,557 ----
  /* Define if you have the <ncurses.h> header file.  */
  #undef HAVE_NCURSES_H
+ 
+ /* Define if you have the <ndbm.h> header file.  */
+ #undef HAVE_NDBM_H
  
  /* Define if you have the <ndir.h> header file.  */