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

[Guido van Rossum]

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

Modified Files:
	Setup.dist Setup.config.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: Setup.dist
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/Setup.dist,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Setup.dist	2001/01/09 21:46:50	1.4
--- Setup.dist	2001/01/10 18:53:48	1.5
***************
*** 121,124 ****
--- 121,126 ----
  # it, depending on your system -- see the GNU readline instructions.
  # It's okay for this to be a shared library, too.
+ #
+ # First, look at Setup.config; configure may have set this for you.
  
  #readline readline.c -lreadline -ltermcap
***************
*** 323,326 ****
--- 325,330 ----
  # instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include
  # -L/usr/5lib before -lcurses).
+ #
+ # First, look at Setup.config; configure may have set this for you.
  
  #_curses _cursesmodule.c -lcurses -ltermcap

Index: Setup.config.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/Setup.config.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Setup.config.in	2000/10/26 14:57:29	1.5
--- Setup.config.in	2001/01/10 18:53:48	1.6
***************
*** 2,18 ****
  
  # The purpose of this file is to conditionally enable certain modules
! # based on configure-time options.  Currently thread support, garbage
! # collection support, and the BSD DB modules are the only modules so
! # enabled.
  
- @USE_THREAD_MODULE@thread threadmodule.c
- 
  # 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
--- 2,23 ----
  
  # The purpose of this file is to conditionally enable certain modules
! # based on configure-time options.
  
  # Garbage collection enabled with --with-cycle-gc
  @USE_GC_MODULE@gc gcmodule.c
+ 
+ # Threading
+ @USE_THREAD_MODULE@thread threadmodule.c
+ 
+ # You may want the following to be built as statically loaded modules;
+ # comment out the *shared* line in that case:
+ 
+ *shared*
  
! # Readline
! @USE_READLINE_MODULE@readline readline.c -lreadline -ltermcap
  
! # The ncurses library, under Linux
! @USE_NCURSES_MODULE@_curses _cursesmodule.c -lncurses -ltermcap
  
  # bsddb module enabled by --with-libdb or presence of db.h