[Python-checkins] CVS: python/dist/src configure,1.181,1.182 configure.in,1.189,1.190

[Eric S. Raymond]

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

Modified Files:
	configure configure.in 
Log Message:
Eric the half-a-wit, driven to berserk rage after repeatedly doing
builds during which he forgot to uncomment crucial library lines in
Setup, walks into Guido's East End nightclub with a tactical nuclear
weapon on his shoulder.  Said nuclear weapon is promptly deployed
exactly where it will do the most good, right in the middle of
configure.in.

With this patch, the set of libraries autoconfigured in is extended to 
include ndbm, gdbm, and crypt.  This essentially eliminates any need to
tweak Setup for a normal Linux build.

"'E was a fair man.  Cruel, but fair."


Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.181
retrieving revision 1.182
diff -C2 -r1.181 -r1.182
*** configure	2001/01/16 15:26:34	1.181
--- configure	2001/01/17 08:25:10	1.182
***************
*** 1,5 ****
  #! /bin/sh
  
! # From configure.in Revision: 1.188 
  
  # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
  #! /bin/sh
  
! # From configure.in Revision: 1.189 
  
[...2507 lines suppressed...]
  s%@USE_GC_MODULE@%$USE_GC_MODULE%g
  s%@USE_DBM_MODULE@%$USE_DBM_MODULE%g
- s%@HAVE_LIBNDBM@%$HAVE_LIBNDBM%g
  s%@USE_BSDDB_MODULE@%$USE_BSDDB_MODULE%g
  s%@HAVE_LIBDB@%$HAVE_LIBDB%g
--- 6571,6584 ----
  s%@USE_NCURSES_MODULE@%$USE_NCURSES_MODULE%g
  s%@USE_READLINE_MODULE@%$USE_READLINE_MODULE%g
+ s%@USE_GDBM_MODULE@%$USE_GDBM_MODULE%g
+ s%@HAVE_LIBGDBM@%$HAVE_LIBGDBM%g
+ s%@USE_NDBM_MODULE@%$USE_NDBM_MODULE%g
+ s%@HAVE_LIBNDBM@%$HAVE_LIBNDBM%g
+ s%@USE_CRYPT_MODULE@%$USE_CRYPT_MODULE%g
+ s%@HAVE_LIBCRYPT@%$HAVE_LIBCRYPT%g
  s%@USE_THREAD_MODULE@%$USE_THREAD_MODULE%g
  s%@LDLAST@%$LDLAST%g
  s%@USE_GC_MODULE@%$USE_GC_MODULE%g
  s%@USE_DBM_MODULE@%$USE_DBM_MODULE%g
  s%@USE_BSDDB_MODULE@%$USE_BSDDB_MODULE%g
  s%@HAVE_LIBDB@%$HAVE_LIBDB%g

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.189
retrieving revision 1.190
diff -C2 -r1.189 -r1.190
*** configure.in	2001/01/16 15:01:26	1.189
--- configure.in	2001/01/17 08:25:10	1.190
***************
*** 750,754 ****
  ], AC_MSG_RESULT(no))
  
! # This is used to generate Setup.config
  AC_SUBST(USE_NCURSES_MODULE)
  AC_CHECK_LIB(ncurses, initscr, 
--- 750,758 ----
  ], AC_MSG_RESULT(no))
  
! #
! # These are used to generate Setup.config.  They autoconfigure several
! # features that are otherwise severe pains in the butt.
! #
! # ncurses
  AC_SUBST(USE_NCURSES_MODULE)
  AC_CHECK_LIB(ncurses, initscr, 
***************
*** 756,761 ****
  	[USE_NCURSES_MODULE="#"],
  	-ltermcap)
! 
! # This is used to generate Setup.config
  AC_SUBST(USE_READLINE_MODULE)
  AC_CHECK_LIB(readline, readline, 
--- 760,764 ----
  	[USE_NCURSES_MODULE="#"],
  	-ltermcap)
! # GNU readline
  AC_SUBST(USE_READLINE_MODULE)
  AC_CHECK_LIB(readline, readline, 
***************
*** 763,766 ****
--- 766,793 ----
  	[USE_READLINE_MODULE="#"], 
  	-ltermcap)
+ # gdbm(3)
+ AC_SUBST(USE_GDBM_MODULE)
+ AC_SUBST(HAVE_LIBGDBM)
+ AC_CHECK_LIB(gdbm, gdbm_open, 
+ 	[USE_GDBM_MODULE="" 
+ 	HAVE_LIBGDBM=-lgdbm],
+ 	[USE_GDBM_MODULE="#"
+ 	HAVE_LIBGDBM=""])
+ # ndbm(3)
+ AC_SUBST(USE_NDBM_MODULE)
+ AC_SUBST(HAVE_LIBNDBM)
+ AC_CHECK_LIB(ndbm, ndbm_open, 
+ 	[USE_NDBM_MODULE=""
+ 	HAVE_LIBNDBM=-lndbm],
+ 	[USE_NDBM_MODULE="#"
+ 	HAVE_LIBNDBM=""])
+ # crypt(3)
+ AC_SUBST(USE_CRYPT_MODULE)
+ AC_SUBST(HAVE_LIBCRYPT)
+ AC_CHECK_LIB(crypt, crypt, 
+ 	[USE_CRYPT_MODULE=""
+ 	HAVE_LIBCRYPT=-lcrypt],
+ 	[USE_CRYPT_MODULE="#"
+ 	HAVE_LIBCRYPT=""])
  
  # This is used to generate Setup.config
***************
*** 906,910 ****
      # s/he requested it
      if test "$with_dbm" = "yes"
!     then echo $ac_n "(requested by no ndbm.h was found) $ac_c"
      fi
      with_dbm="no"
--- 933,937 ----
      # s/he requested it
      if test "$with_dbm" = "yes"
!     then echo $ac_n "(requested but no ndbm.h was found) $ac_c"
      fi
      with_dbm="no"