mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Issue #28190: Merge 3.6.

Browse source
This commit is contained in:
Xavier de Gaye 2016-12-13 16:05:15 +01:00
commit f191a9e8e4
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
configure vendored
View file

@ -15706,7 +15706,9 @@ fi
# first curses header check # first curses header check
ac_save_cppflags="$CPPFLAGS" ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" if test "$cross_compiling" = no; then
CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
fi
for ac_header in curses.h ncurses.h for ac_header in curses.h ncurses.h
do : do :

4
configure.ac
View file

@ -4889,7 +4889,9 @@ fi
# first curses header check # first curses header check
ac_save_cppflags="$CPPFLAGS" ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" if test "$cross_compiling" = no; then
CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
fi
AC_CHECK_HEADERS(curses.h ncurses.h) AC_CHECK_HEADERS(curses.h ncurses.h)

3
setup.py
View file

@ -1350,7 +1350,8 @@ class PyBuildExt(build_ext):
panel_library = 'panel' panel_library = 'panel'
if curses_library == 'ncursesw': if curses_library == 'ncursesw':
curses_defines.append(('HAVE_NCURSESW', '1')) curses_defines.append(('HAVE_NCURSESW', '1'))
curses_includes.append('/usr/include/ncursesw') if not cross_compiling:
curses_includes.append('/usr/include/ncursesw')
# Bug 1464056: If _curses.so links with ncursesw, # Bug 1464056: If _curses.so links with ncursesw,
# _curses_panel.so must link with panelw. # _curses_panel.so must link with panelw.
panel_library = 'panelw' panel_library = 'panelw'