From bdba3b6d72810df9ed7600cb5ea469e4199595ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sat, 11 Feb 2006 15:55:22 +0000 Subject: Patch #428494: Prefer linking against ncursesw over ncurses library --- Misc/NEWS | 5 +++++ setup.py | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 4d23a97..ea68763 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -112,6 +112,11 @@ Tools/Demos - Fixed a display glitch in Pynche, which could cause the right arrow to wiggle over by a pixel. +Build +----- + +- Patch #1428494: Prefer linking against ncursesw over ncurses library. + What's New in Python 2.4.2 final? ================================= diff --git a/setup.py b/setup.py index 4bf0510..7d874cd 100644 --- a/setup.py +++ b/setup.py @@ -425,6 +425,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'): @@ -678,7 +681,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) ) -- cgit v0.12