check for wget_wch() instead of addwstr() when looking for a wide

version of curses

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

diff --git a/ChangeLog b/ChangeLog
index 92e4ea693d8160604b9576b7941b2d447ab74a60..993ee1f3389adb8dfcf7223154e8e3cc62bdd402 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -134,10 +134,7 @@ CVS code -
 - configure.ac:
        - Remove specific references to control key shortcuts. (DLR)
        - Check for the wide version of ncurses, without which multibyte
-         strings don't seem to be displayed properly. (DLR; check for
-         addwstr() in curses to determine whether it has wide character
-         support inspired by mutt 1.4.2.1i's checking for waddnwstr()
-         for the same reason)
+         strings don't seem to be displayed properly. (DLR)
 - doc/nanorc.sample:
        - Add return to the "c-file" regexes. (DLR)
 

diff --git a/configure.ac b/configure.ac
index 65c7325030b1d3723e9f148524de43571bb95848..c37f5ca9d7a3794c6d58306a532518cd562412aa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -313,7 +313,7 @@ dnl Checks for libraries.
 if eval "test x$CURSES_LIB_NAME = x"
 then
     AC_CHECK_HEADERS(ncurses.h)
-    AC_CHECK_LIB(ncursesw, addwstr, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE="yes"])
+    AC_CHECK_LIB(ncursesw, wget_wch, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE="yes"])
     if eval "test x$CURSES_LIB_NAME = x"
     then
         AC_CHECK_LIB(ncurses, initscr, [CURSES_LIB="-lncurses" CURSES_LIB_NAME=ncurses])
@@ -323,7 +323,7 @@ fi
 if eval "test x$CURSES_LIB_NAME = x"
 then
     AC_CHECK_HEADERS(curses.h)
-    AC_CHECK_LIB(curses, addwstr, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses CURSES_LIB_WIDE="yes"])
+    AC_CHECK_LIB(curses, wget_wch, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses CURSES_LIB_WIDE="yes"])
     if eval "test x$CURSES_LIB_NAME = x"
     then
         AC_CHECK_LIB(curses, initscr, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses])