File tree Expand file tree Collapse file tree 3 files changed +10
-2
lines changed Expand file tree Collapse file tree 3 files changed +10
-2
lines changed Original file line number Diff line number Diff line change @@ -355,6 +355,7 @@ IO_OBJS= \
355
355
##########################################################################
356
356
357
357
LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
358
+ NCURSESW_INCLUDEDIR= @NCURSESW_INCLUDEDIR@
358
359
359
360
##########################################################################
360
361
# Parser
Original file line number Diff line number Diff line change @@ -6410,10 +6410,17 @@ then
6410
6410
[ Define if you have struct stat.st_mtimensec] )
6411
6411
fi
6412
6412
6413
+ if test -n "$PKG_CONFIG"; then
6414
+ NCURSESW_INCLUDEDIR="`"$PKG_CONFIG" ncursesw --cflags-only-I 2>/dev/null | sed -e 's/^-I//;s/ *$//'`"
6415
+ else
6416
+ NCURSESW_INCLUDEDIR=""
6417
+ fi
6418
+ AC_SUBST ( NCURSESW_INCLUDEDIR )
6419
+
6413
6420
# first curses header check
6414
6421
ac_save_cppflags="$CPPFLAGS"
6415
6422
if test "$cross_compiling" = no; then
6416
- CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw "
6423
+ CPPFLAGS="$CPPFLAGS -I$NCURSESW_INCLUDEDIR "
6417
6424
fi
6418
6425
6419
6426
AC_CHECK_HEADERS ( curses.h ncurses.h )
Original file line number Diff line number Diff line change @@ -1145,7 +1145,7 @@ def detect_readline_curses(self):
1145
1145
if curses_library == 'ncursesw' :
1146
1146
curses_defines .append (('HAVE_NCURSESW' , '1' ))
1147
1147
if not CROSS_COMPILING :
1148
- curses_includes .append ('/usr/include/ncursesw' )
1148
+ curses_includes .append (sysconfig . get_config_var ( "NCURSESW_INCLUDEDIR" ) )
1149
1149
# Bug 1464056: If _curses.so links with ncursesw,
1150
1150
# _curses_panel.so must link with panelw.
1151
1151
panel_library = 'panelw'
You can’t perform that action at this time.
0 commit comments