[Python-checkins] CVS: python/dist/src setup.py,1.17,1.18

[M.-A. Lemburg]

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

Modified Files:
	setup.py 
Log Message:
Be extra careful with linking against libtermcap. This is now only done
if we can find the libtermcap in the usual places. Some platforms don't
have libtermcap, e.g. MacOSX.



Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** setup.py	2001/01/26 18:03:24	1.17
--- setup.py	2001/01/26 18:23:02	1.18
***************
*** 243,250 ****
  
          # readline
!         if (self.compiler.find_library_file(lib_dirs, 'readline')):
              exts.append( Extension('readline', ['readline.c'],
                                     library_dirs=['/usr/lib/termcap'],
!                                    libraries=['readline', 'termcap']) )
  
          # The crypt module is now disabled by default because it breaks builds
--- 243,255 ----
  
          # readline
!         if self.compiler.find_library_file(lib_dirs, 'readline'):
!             readline_libs = ['readline']
!             if self.compiler.find_library_file(lib_dirs +
!                                                ['/usr/lib/termcap'],
!                                                'termcap'):
!                 readline_libs.append('termcap')
              exts.append( Extension('readline', ['readline.c'],
                                     library_dirs=['/usr/lib/termcap'],
!                                    libraries=readline_libs) )
  
          # The crypt module is now disabled by default because it breaks builds