pyrox.dev
1diff --git a/setup.py b/setup.py
2index 2779658..902d0eb 100644
3--- a/setup.py
4+++ b/setup.py
5@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext):
6 # Rather than complicate the code below, detecting and building
7 # AquaTk is a separate method. Only one Tkinter will be built on
8 # Darwin - either AquaTk, if it is found, or X11 based Tk.
9- if (host_platform == 'darwin' and
10- self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
11- return
12
13 # Assume we haven't found any of the libraries or include files
14 # The versions with dots are used on Unix, and the versions without
15@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext):
16 if dir not in include_dirs:
17 include_dirs.append(dir)
18
19- # Check for various platform-specific directories
20- if host_platform == 'sunos5':
21- include_dirs.append('/usr/openwin/include')
22- added_lib_dirs.append('/usr/openwin/lib')
23- elif os.path.exists('/usr/X11R6/include'):
24- include_dirs.append('/usr/X11R6/include')
25- added_lib_dirs.append('/usr/X11R6/lib64')
26- added_lib_dirs.append('/usr/X11R6/lib')
27- elif os.path.exists('/usr/X11R5/include'):
28- include_dirs.append('/usr/X11R5/include')
29- added_lib_dirs.append('/usr/X11R5/lib')
30- else:
31- # Assume default location for X11
32- include_dirs.append('/usr/X11/include')
33- added_lib_dirs.append('/usr/X11/lib')
34-
35 # If Cygwin, then verify that X is installed before proceeding
36 if host_platform == 'cygwin':
37 x11_inc = find_file('X11/Xlib.h', [], include_dirs)
38@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext):
39 if host_platform in ['aix3', 'aix4']:
40 libs.append('ld')
41
42- # Finally, link with the X11 libraries (not appropriate on cygwin)
43- if host_platform != "cygwin":
44- libs.append('X11')
45-
46 ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
47 define_macros=[('WITH_APPINIT', 1)] + defs,
48 include_dirs = include_dirs,