Mercurial > cpython-lru_cache-weakref
diff setup.py @ 27695:1a300f475332 legacy-trunk
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.
| author | Jason Tishler <jason@tishler.net> |
|---|---|
| date | Wed, 05 Feb 2003 15:16:17 +0000 |
| parents | 7c4dda0c145f |
| children | fbc45beaf034 |
line wrap: on
line diff
--- a/setup.py Wed Feb 05 15:06:46 2003 +0000 +++ b/setup.py Wed Feb 05 15:16:17 2003 +0000 @@ -953,11 +953,6 @@ if platform == 'sunos5': 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') added_lib_dirs.append('/usr/X11R6/lib') @@ -969,6 +964,12 @@ 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 if self.compiler.find_library_file(lib_dirs + added_lib_dirs, 'BLT8.0'):