Commit 3db5b8cc authored by Martin v. Löwis's avatar Martin v. Löwis

Patch #443669: Permit _tkinter to build on cygwin32.

parent 791bfda2
...@@ -527,8 +527,11 @@ class PyBuildExt(build_ext): ...@@ -527,8 +527,11 @@ class PyBuildExt(build_ext):
# The _tkinter module. # The _tkinter module.
# Assume we haven't found any of the libraries or include files # Assume we haven't found any of the libraries or include files
# The versions with dots are used on Unix, and the versions without
# dots on Windows, for detection by cygwin.
tcllib = tklib = tcl_includes = tk_includes = None tcllib = tklib = tcl_includes = tk_includes = None
for version in ['8.4', '8.3', '8.2', '8.1', '8.0']: for version in ['8.4', '84', '8.3', '83', '8.2',
'82', '8.1', '81', '8.0', '80']:
tklib = self.compiler.find_library_file(lib_dirs, tklib = self.compiler.find_library_file(lib_dirs,
'tk' + version ) 'tk' + version )
tcllib = self.compiler.find_library_file(lib_dirs, tcllib = self.compiler.find_library_file(lib_dirs,
...@@ -586,8 +589,9 @@ class PyBuildExt(build_ext): ...@@ -586,8 +589,9 @@ class PyBuildExt(build_ext):
if platform in ['aix3', 'aix4']: if platform in ['aix3', 'aix4']:
libs.append('ld') libs.append('ld')
# Finally, link with the X11 libraries # Finally, link with the X11 libraries (not appropriate on cygwin)
libs.append('X11') if platform != "cygwin":
libs.append('X11')
ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
define_macros=[('WITH_APPINIT', 1)] + defs, define_macros=[('WITH_APPINIT', 1)] + defs,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment