diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2006-02-11 15:55:14 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2006-02-11 15:55:14 (GMT) |
| commit | a55e55e9f3034ceacbf90facc1a0548d63250df4 (patch) | |
| tree | 5cc07bb95b33ddc1a671a4d3b2e3a7a4590fd7b0 | |
| parent | b69406dc09161797cf7e9355acdb761f944ac3e7 (diff) | |
| download | cpython-a55e55e9f3034ceacbf90facc1a0548d63250df4.zip cpython-a55e55e9f3034ceacbf90facc1a0548d63250df4.tar.gz cpython-a55e55e9f3034ceacbf90facc1a0548d63250df4.tar.bz2 | |
Patch #428494: Prefer linking against ncursesw over ncurses library
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | setup.py | 9 |
2 files changed, 10 insertions, 1 deletions
@@ -699,6 +699,8 @@ Library Build ----- +- Patch #1428494: Prefer linking against ncursesw over ncurses library. + - Patch #881820: look for openpty and forkpty also in libbsd. - The sources of zlib are now part of the Python distribution (zlib 1.2.3). @@ -450,6 +450,9 @@ class PyBuildExt(build_ext): if self.compiler.find_library_file(lib_dirs, 'readline'): readline_libs = ['readline'] if self.compiler.find_library_file(lib_dirs, + 'ncursesw'): + readline_libs.append('ncursesw') + elif self.compiler.find_library_file(lib_dirs, 'ncurses'): readline_libs.append('ncurses') elif self.compiler.find_library_file(lib_dirs, 'curses'): @@ -751,7 +754,11 @@ class PyBuildExt(build_ext): # Curses support, requiring the System V version of curses, often # provided by the ncurses library. - if (self.compiler.find_library_file(lib_dirs, 'ncurses')): + if (self.compiler.find_library_file(lib_dirs, 'ncursesw')): + curses_libs = ['ncursesw'] + exts.append( Extension('_curses', ['_cursesmodule.c'], + libraries = curses_libs) ) + elif (self.compiler.find_library_file(lib_dirs, 'ncurses')): curses_libs = ['ncurses'] exts.append( Extension('_curses', ['_cursesmodule.c'], libraries = curses_libs) ) |