From aa35b0032235b6b935da0f08f79bba7296ced5fc Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Tue, 29 Nov 2011 00:08:12 +0100 Subject: [PATCH] cleanup setup.py for curses options --- setup.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/setup.py b/setup.py index 1e450c7822..fff43619ae 100644 --- a/setup.py +++ b/setup.py @@ -1166,20 +1166,19 @@ class PyBuildExt(build_ext): else: missing.extend(['nis', 'resource', 'termios']) + # Curses support, requiring the System V version of curses, often + # provided by the ncurses library. curses_defines = [] + curses_includes = [] + panel_library = 'panel' if curses_library == 'ncursesw': curses_defines.append(('HAVE_NCURSESW', '1')) + curses_includes.append('/usr/include/ncursesw') + # Bug 1464056: If _curses.so links with ncursesw, + # _curses_panel.so must link with panelw. + panel_library = 'panelw' - # Curses support, requiring the System V version of curses, often - # provided by the ncurses library. - panel_library = 'panel' - curses_includes = [] if curses_library.startswith('ncurses'): - if curses_library == 'ncursesw': - # Bug 1464056: If _curses.so links with ncursesw, - # _curses_panel.so must link with panelw. - panel_library = 'panelw' - curses_includes = ['/usr/include/ncursesw'] curses_libs = [curses_library] exts.append( Extension('_curses', ['_cursesmodule.c'], include_dirs=curses_includes, -- 2.40.0