[Python-checkins] CVS: python/dist/src setup.py,1.48,1.49

[A.M. Kuchling]

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

Modified Files:
	setup.py 
Log Message:
Link readline module with ncurses in preference to termcap. [Bug ##441580]
Remove pointless comment


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** setup.py	2001/08/15 13:17:45	1.48
--- setup.py	2001/08/16 20:30:18	1.49
***************
*** 311,315 ****
          if self.compiler.find_library_file(lib_dirs, 'readline'):
              readline_libs = ['readline']
!             if self.compiler.find_library_file(lib_dirs +
                                                 ['/usr/lib/termcap'],
                                                 'termcap'):
--- 311,318 ----
          if self.compiler.find_library_file(lib_dirs, 'readline'):
              readline_libs = ['readline']
!             if self.compiler.find_library_file(lib_dirs,
!                                                  'ncurses'):
!                 readline_libs.append('ncurses')
!             elif self.compiler.find_library_file(lib_dirs +
                                                 ['/usr/lib/termcap'],
                                                 'termcap'):
***************
*** 319,324 ****
                                     libraries=readline_libs) )
  
!         # The crypt module is now disabled by default because it breaks builds
!         # on many systems (where -lcrypt is needed), e.g. Linux (I believe).
  
          if self.compiler.find_library_file(lib_dirs, 'crypt'):
--- 322,326 ----
                                     libraries=readline_libs) )
  
!         # crypt module.
  
          if self.compiler.find_library_file(lib_dirs, 'crypt'):