2013-01-09 Fabian Groffen <grobian@Savannah>

        * configure.ac, src/nano.h: Make search for ncursesw more generalized.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4561 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 91aca9f88b79a1066ea47013d4669b7b2045c786..19f0ebce263d35683a5e4036b2a3d05f6f0d9851 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2013-01-09 Fabian Groffen <grobian@Savannah>
+        * configure.ac, src/nano.h: Make search for ncursesw more generalized.
+
 2013-01-02 David Benjamin <davidben@Savannah>
         * src/search.c (parse_syntax): Fix blatantly and dangerously incorrect  code for 
           deleting old syntaxes.

diff --git a/configure.ac b/configure.ac
index fdccc39d3f59096a636c7ef705cc2e4b0ddeacec..e999e41582049fb4e50e7806c03ab1a23623eeb0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -441,7 +441,8 @@ if eval "test x$CURSES_LIB_NAME = x"; then
     AC_CHECK_HEADERS(ncurses.h)
 
     if test x$enable_utf8 != xno; then
-       AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CPPFLAGS="-I/usr/include/ncursesw $CPPFLAGS" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
+       AC_CHECK_HEADERS(ncursesw/ncurses.h)
+       AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
     fi
 
     if eval "test x$CURSES_LIB_NAME = x"; then

diff --git a/src/nano.h b/src/nano.h
index 221f10b92936a34bab3033f39283d71887883b25..bb7379430462ac0c07d34ff5f8a5d9842fe419e1 100644 (file)
--- a/src/nano.h
+++ b/src/nano.h
@@ -85,6 +85,8 @@
 #define KEY_DC SL_KEY_DELETE
 #define KEY_IC SL_KEY_IC
 /* Ncurses support. */
+#elif defined(HAVE_NCURSESW_NCURSES_H)
+#include <ncursesw/ncurses.h>
 #elif defined(HAVE_NCURSES_H)
 #include <ncurses.h>
 #else