[Python-checkins] CVS: python/dist/src setup.py,1.56,1.57

A.M. Kuchling akuchling@users.sourceforge.net
Tue, 18 Sep 2001 13:32:15 -0700


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

Modified Files:
	setup.py 
Log Message:
[Patch #462258] On Cygwin, don't build Tkinter unless the X header files 
    can be found.


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** setup.py	2001/09/17 16:19:15	1.56
--- setup.py	2001/09/18 20:32:13	1.57
***************
*** 654,657 ****
--- 654,664 ----
              added_lib_dirs.append('/usr/X11/lib')
  
+         # If Cygwin, then verify that X is installed before proceeding
+         if platform == 'cygwin':
+             x11_inc = find_file('X11/Xlib.h', [], inc_dirs)
+             if x11_inc is None:
+                 # X header files missing, so give up
+                 return
+ 
          # Check for BLT extension
          if self.compiler.find_library_file(lib_dirs + added_lib_dirs, 'BLT8.0'):