[Python-checkins] CVS: python/dist/src setup.py,1.36,1.37

[Martin v. L?wis]

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

Modified Files:
	setup.py 
Log Message:
Remove Tix detection from Tkinter part; lib-tk/Tix attempts to load Tix
by requiring it. Also remove commentary from Setup.dist about commenting
in and out stuff.


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** setup.py	2001/03/17 16:56:35	1.36
--- setup.py	2001/03/21 07:44:53	1.37
***************
*** 505,518 ****
      def detect_tkinter(self, inc_dirs, lib_dirs):
          # The _tkinter module.
!         #
!         # The command for _tkinter is long and site specific.  Please
!         # uncomment and/or edit those parts as indicated.  If you don't have a
!         # specific extension (e.g. Tix or BLT), leave the corresponding line
!         # commented out.  (Leave the trailing backslashes in!  If you
!         # experience strange errors, you may want to join all uncommented
!         # lines and remove the backslashes -- the backslash interpretation is
!         # done by the shell's "read" command and it may not be implemented on
!         # every system.
! 
          # Assume we haven't found any of the libraries or include files
          tcllib = tklib = tcl_includes = tk_includes = None
--- 505,509 ----
      def detect_tkinter(self, inc_dirs, lib_dirs):
          # The _tkinter module.
!         
          # Assume we haven't found any of the libraries or include files
          tcllib = tklib = tcl_includes = tk_includes = None
***************
*** 562,570 ****
              include_dirs.append('/usr/X11/include')
              added_lib_dirs.append('/usr/X11/lib')
- 
-         # Check for Tix extension
-         if self.compiler.find_library_file(lib_dirs + added_lib_dirs, 'tix4.1.8.0'):
-             defs.append( ('WITH_TIX', 1) )
-             libs.append('tix4.1.8.0')
  
          # Check for BLT extension
--- 553,556 ----