changeset:   105607:bdf92b4e02f2
parent:      105605:db1d20825d71
parent:      105606:8c78d844d6f0
user:        Xavier de Gaye <xdegaye@users.sourceforge.net>
date:        Tue Dec 13 16:05:15 2016 +0100
files:       configure configure.ac setup.py
description:
Issue #28190: Merge 3.6.


diff -r db1d20825d71 -r bdf92b4e02f2 configure
--- a/configure	Tue Dec 13 10:03:34 2016 +0100
+++ b/configure	Tue Dec 13 16:05:15 2016 +0100
@@ -15706,7 +15706,9 @@
 
 # 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 :
diff -r db1d20825d71 -r bdf92b4e02f2 configure.ac
--- a/configure.ac	Tue Dec 13 10:03:34 2016 +0100
+++ b/configure.ac	Tue Dec 13 16:05:15 2016 +0100
@@ -4889,7 +4889,9 @@
 
 # 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)
 
diff -r db1d20825d71 -r bdf92b4e02f2 setup.py
--- a/setup.py	Tue Dec 13 10:03:34 2016 +0100
+++ b/setup.py	Tue Dec 13 16:05:15 2016 +0100
@@ -1350,7 +1350,8 @@
         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'