diff --git a/Makefile.pre.in b/Makefile.pre.in index be6d2d69485afe..b310aee94ba565 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -355,6 +355,7 @@ IO_OBJS= \ ########################################################################## LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ +NCURSESW_INCLUDEDIR= @NCURSESW_INCLUDEDIR@ ########################################################################## # Parser diff --git a/configure.ac b/configure.ac index 29527583ed5a2c..2a3f22b5bf0cc9 100644 --- a/configure.ac +++ b/configure.ac @@ -6410,10 +6410,17 @@ then [Define if you have struct stat.st_mtimensec]) fi +if test -n "$PKG_CONFIG"; then + NCURSESW_INCLUDEDIR="`"$PKG_CONFIG" ncursesw --cflags-only-I 2>/dev/null | sed -e 's/^-I//;s/ *$//'`" +else + NCURSESW_INCLUDEDIR="" +fi +AC_SUBST(NCURSESW_INCLUDEDIR) + # first curses header check ac_save_cppflags="$CPPFLAGS" if test "$cross_compiling" = no; then - CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" + CPPFLAGS="$CPPFLAGS -I$NCURSESW_INCLUDEDIR" fi AC_CHECK_HEADERS(curses.h ncurses.h) diff --git a/setup.py b/setup.py index 6bf58bff02fe2d..b6b6a5e2da02ad 100644 --- a/setup.py +++ b/setup.py @@ -1145,7 +1145,7 @@ def detect_readline_curses(self): if curses_library == 'ncursesw': curses_defines.append(('HAVE_NCURSESW', '1')) if not CROSS_COMPILING: - curses_includes.append('/usr/include/ncursesw') + curses_includes.append(sysconfig.get_config_var("NCURSESW_INCLUDEDIR")) # Bug 1464056: If _curses.so links with ncursesw, # _curses_panel.so must link with panelw. panel_library = 'panelw'