[Python-checkins] CVS: python/dist/src setup.py,1.67,1.68

[Fred L. Drake]

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

Modified Files:
	setup.py 
Log Message:
Wrap some long lines.

Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** setup.py	2001/12/06 15:57:16	1.67
--- setup.py	2001/12/06 22:24:47	1.68
***************
*** 158,162 ****
          # reliably imported into a command-line Python
          if 'Carbon' in ext.extra_link_args:
!         	self.announce('WARNING: skipping import check for Carbon-based "%s"' % ext.name)
          	return
          try:
--- 158,164 ----
          # reliably imported into a command-line Python
          if 'Carbon' in ext.extra_link_args:
!         	self.announce(
!                     'WARNING: skipping import check for Carbon-based "%s"' %
!                     ext.name)
          	return
          try:
***************
*** 266,271 ****
  
          # The md5 module implements the RSA Data Security, Inc. MD5
!         # Message-Digest Algorithm, described in RFC 1321.  The necessary files
!         # md5c.c and md5.h are included here.
          exts.append( Extension('md5', ['md5module.c', 'md5c.c']) )
  
--- 268,273 ----
  
          # The md5 module implements the RSA Data Security, Inc. MD5
!         # Message-Digest Algorithm, described in RFC 1321.  The
!         # necessary files md5c.c and md5.h are included here.
          exts.append( Extension('md5', ['md5module.c', 'md5c.c']) )
  
***************
*** 462,467 ****
              exts.append( Extension('_curses', ['_cursesmodule.c'],
                                     libraries = curses_libs) )
!         elif (self.compiler.find_library_file(lib_dirs, 'curses')) and platform != 'darwin':
!         	# OSX has an old Berkeley curses, not good enough for the _curses module.
              if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
                  curses_libs = ['curses', 'terminfo']
--- 464,471 ----
              exts.append( Extension('_curses', ['_cursesmodule.c'],
                                     libraries = curses_libs) )
!         elif (self.compiler.find_library_file(lib_dirs, 'curses')
!               and platform != 'darwin'):
!         	# OSX has an old Berkeley curses, not good enough for
!         	# the _curses module.
              if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
                  curses_libs = ['curses', 'terminfo']
***************
*** 489,494 ****
                                     libraries=['fpe']) )
          elif 0: # XXX how to detect SunPro?
!             # For Solaris with SunPro compiler (tested on Solaris 2.5 with SunPro C 4.2):
!             # (Without the compiler you don't have -lsunmath.)
              #fpectl fpectlmodule.c -R/opt/SUNWspro/lib -lsunmath -lm
              pass
--- 493,499 ----
                                     libraries=['fpe']) )
          elif 0: # XXX how to detect SunPro?
!             # For Solaris with SunPro compiler (tested on Solaris 2.5
!             # with SunPro C 4.2): (Without the compiler you don't have
!             # -lsunmath.)
              #fpectl fpectlmodule.c -R/opt/SUNWspro/lib -lsunmath -lm
              pass
***************
*** 578,582 ****
              exts.append( Extension('icglue', ['icgluemodule.c'],
              		extra_link_args=['-framework', 'Carbon']) )
!             exts.append( Extension('macfs', ['macfsmodule.c', '../Python/getapplbycreator.c'],
              		extra_link_args=['-framework', 'Carbon']) )
              exts.append( Extension('_CF', ['cf/_CFmodule.c']) )
--- 583,589 ----
              exts.append( Extension('icglue', ['icgluemodule.c'],
              		extra_link_args=['-framework', 'Carbon']) )
!             exts.append( Extension('macfs',
!                                    ['macfsmodule.c',
!                                     '../Python/getapplbycreator.c'],
              		extra_link_args=['-framework', 'Carbon']) )
              exts.append( Extension('_CF', ['cf/_CFmodule.c']) )
***************
*** 616,620 ****
              		extra_link_args=['-framework', 'Carbon']) )
                  exts.append( Extension('_Qt', ['qt/_Qtmodule.c'],
!                         extra_link_args=['-framework', 'QuickTime', '-framework', 'Carbon']) )
  ##              exts.append( Extension('_Scrap', ['scrap/_Scrapmodule.c']) )
                  exts.append( Extension('_TE', ['te/_TEmodule.c'],
--- 623,628 ----
              		extra_link_args=['-framework', 'Carbon']) )
                  exts.append( Extension('_Qt', ['qt/_Qtmodule.c'],
!                         extra_link_args=['-framework', 'QuickTime',
!                                          '-framework', 'Carbon']) )
  ##              exts.append( Extension('_Scrap', ['scrap/_Scrapmodule.c']) )
                  exts.append( Extension('_TE', ['te/_TEmodule.c'],
***************
*** 652,656 ****
              # they're put in /usr/include/{tcl,tk}X.Y
              debian_tcl_include = [ '/usr/include/tcl' + version ]
!             debian_tk_include =  [ '/usr/include/tk'  + version ] + debian_tcl_include
              tcl_includes = find_file('tcl.h', inc_dirs, debian_tcl_include)
              tk_includes = find_file('tk.h', inc_dirs, debian_tk_include)
--- 660,665 ----
              # they're put in /usr/include/{tcl,tk}X.Y
              debian_tcl_include = [ '/usr/include/tcl' + version ]
!             debian_tk_include =  [ '/usr/include/tk'  + version ] + \
!                                  debian_tcl_include
              tcl_includes = find_file('tcl.h', inc_dirs, debian_tcl_include)
              tk_includes = find_file('tk.h', inc_dirs, debian_tk_include)
***************
*** 692,696 ****
  
          # Check for BLT extension
!         if self.compiler.find_library_file(lib_dirs + added_lib_dirs, 'BLT8.0'):
              defs.append( ('WITH_BLT', 1) )
              libs.append('BLT8.0')
--- 701,706 ----
  
          # Check for BLT extension
!         if self.compiler.find_library_file(lib_dirs + added_lib_dirs,
!                                            'BLT8.0'):
              defs.append( ('WITH_BLT', 1) )
              libs.append('BLT8.0')