[Python-checkins] CVS: python/dist/src configure,1.175,1.176 configure.in,1.183,1.184

Guido van Rossum python-dev@python.org
Wed, 10 Jan 2001 10:53:50 -0800


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

Modified Files:
	configure configure.in 
Log Message:
Adapted version of Eric Raymond's patches to automatically configure
curses and readline (for Linux, at least).

These are done as shared libraries by default, and so is bsddb -- that
seems to make the most sense.



Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.175
retrieving revision 1.176
diff -C2 -r1.175 -r1.176
*** configure	2001/01/08 17:58:56	1.175
--- configure	2001/01/10 18:53:47	1.176
***************
*** 1,5 ****
  #! /bin/sh
  
! # From configure.in Revision: 1.182 
  
  # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
  #! /bin/sh
  
! # From configure.in Revision: 1.184 
  
[...2272 lines suppressed...]
  
  echo $ac_n "checking for Modules/Setup""... $ac_c" 1>&6
! echo "configure:6035: checking for Modules/Setup" >&5
  if test ! -f Modules/Setup ; then
      if test ! -d Modules ; then
--- 6121,6125 ----
  
  echo $ac_n "checking for Modules/Setup""... $ac_c" 1>&6
! echo "configure:6124: checking for Modules/Setup" >&5
  if test ! -f Modules/Setup ; then
      if test ! -d Modules ; then
***************
*** 6206,6209 ****
--- 6295,6300 ----
  s%@CCSHARED@%$CCSHARED%g
  s%@LINKFORSHARED@%$LINKFORSHARED%g
+ s%@USE_NCURSES_MODULE@%$USE_NCURSES_MODULE%g
+ s%@USE_READLINE_MODULE@%$USE_READLINE_MODULE%g
  s%@USE_THREAD_MODULE@%$USE_THREAD_MODULE%g
  s%@LDLAST@%$LDLAST%g

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.183
retrieving revision 1.184
diff -C2 -r1.183 -r1.184
*** configure.in	2001/01/08 17:58:56	1.183
--- configure.in	2001/01/10 18:53:48	1.184
***************
*** 735,738 ****
--- 735,753 ----
  ], AC_MSG_RESULT(no))
  
+ # This is used to generate Setup.config
+ AC_SUBST(USE_NCURSES_MODULE)
+ AC_CHECK_LIB(ncurses, initscr, 
+ 	[USE_NCURSES_MODULE=""],
+ 	[USE_NCURSES_MODULE="#"],
+ 	-ltermcap)
+ 
+ # This is used to generate Setup.config
+ AC_SUBST(USE_READLINE_MODULE)
+ AC_CHECK_LIB(readline, readline, 
+ 	[USE_READLINE_MODULE=""],
+ 	[USE_READLINE_MODULE="#"], 
+ 	-ltermcap)
+ 
+ # This is used to generate Setup.config
  AC_SUBST(USE_THREAD_MODULE)
  USE_THREAD_MODULE=""