[Python-checkins] python/dist/src setup.py,1.142,1.143

[jlt63@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv13582

Modified Files:
	setup.py 
Log Message:
This patch reverts the following:

It also prevents building against the real X headers, if installed.

After discussions with the Cygwin project lead, I believe that building
against the real X headers is OK. Especially, since the psuedo-X headers
are *not* installed by the Cygwin Tcl/Tk binary package.


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.142
retrieving revision 1.143
diff -C2 -d -r1.142 -r1.143
*** setup.py	5 Feb 2003 15:06:46 -0000	1.142
--- setup.py	5 Feb 2003 15:16:17 -0000	1.143
***************
*** 954,962 ****
              include_dirs.append('/usr/openwin/include')
              added_lib_dirs.append('/usr/openwin/lib')
-         elif platform == 'cygwin':
-             # Verify that the pseudo-X headers are installed before proceeding
-             x11_inc = find_file('X11/Xlib.h', [], inc_dirs)
-             if x11_inc is None:
-                 return
          elif os.path.exists('/usr/X11R6/include'):
              include_dirs.append('/usr/X11R6/include')
--- 954,957 ----
***************
*** 969,972 ****
--- 964,973 ----
              include_dirs.append('/usr/X11/include')
              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', [], include_dirs)
+             if x11_inc is None:
+                 return
  
          # Check for BLT extension