traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Jason Tishler 2003-02-05 15:16:17 +00:00
parent cccac1a163
commit 9181c94e05
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
setup.py
View File

@ -953,11 +953,6 @@ class PyBuildExt(build_ext):
if platform == 'sunos5': if platform == 'sunos5':
include_dirs.append('/usr/openwin/include') include_dirs.append('/usr/openwin/include')
added_lib_dirs.append('/usr/openwin/lib') 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'): elif os.path.exists('/usr/X11R6/include'):
include_dirs.append('/usr/X11R6/include') include_dirs.append('/usr/X11R6/include')
added_lib_dirs.append('/usr/X11R6/lib') added_lib_dirs.append('/usr/X11R6/lib')
@ -969,6 +964,12 @@ class PyBuildExt(build_ext):
include_dirs.append('/usr/X11/include') include_dirs.append('/usr/X11/include')
added_lib_dirs.append('/usr/X11/lib') 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 # Check for BLT extension
if self.compiler.find_library_file(lib_dirs + added_lib_dirs, if self.compiler.find_library_file(lib_dirs + added_lib_dirs,
'BLT8.0'): 'BLT8.0'):