From: Chris Allegretta <chrisa@asty.org>
Date: Thu, 10 Jan 2013 03:29:59 +0000 (+0000)
Subject: 2013-01-09 Fabian Groffen <grobian@Savannah>
X-Git-Tag: v2.3.2~9
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=2e4228f78eca55c8f341bf952d927c1bb206c8d0;p=nano.git

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 91aca9f8..19f0ebce 100644
--- 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 fdccc39d..e999e415 100644
--- 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 221f10b9..bb737943 100644
--- 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