Issue #28190: Merge 3.6.

f191a9e8 · Xavier de Gaye · f852fff8 · e13c3201 · f191a9e8 · f191a9e8
Kaydet (Commit) f191a9e8 authored Ara 13, 2016 tarafından Xavier de Gaye
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

configure configure +3 -1

configure.ac configure.ac +3 -1

setup.py setup.py +2 -1

No files found.
--- a/configure
+++ b/configure
@@ -15706,7 +15706,9 @@ fi
 # first curses header check
 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
 do :

--- a/configure.ac
+++ b/configure.ac
@@ -4889,7 +4889,9 @@ fi
 # first curses header check
 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)

--- a/setup.py
+++ b/setup.py
@@ -1350,7 +1350,8 @@ class PyBuildExt(build_ext):
        panel_library = 'panel'
        if curses_library == 'ncursesw':
            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,
            # _curses_panel.so must link with panelw.
            panel_library = 'panelw'