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
master
David Lawrence Ramsey 2004-12-20 15:39:12 +00:00
parent f3bea022d6
commit 3ba9c3512c
2 changed files with 3 additions and 6 deletions

View File

@ -134,10 +134,7 @@ CVS code -
- configure.ac: - configure.ac:
- Remove specific references to control key shortcuts. (DLR) - Remove specific references to control key shortcuts. (DLR)
- Check for the wide version of ncurses, without which multibyte - Check for the wide version of ncurses, without which multibyte
strings don't seem to be displayed properly. (DLR; check for strings don't seem to be displayed properly. (DLR)
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)
- doc/nanorc.sample: - doc/nanorc.sample:
- Add return to the "c-file" regexes. (DLR) - Add return to the "c-file" regexes. (DLR)

View File

@ -313,7 +313,7 @@ dnl Checks for libraries.
if eval "test x$CURSES_LIB_NAME = x" if eval "test x$CURSES_LIB_NAME = x"
then then
AC_CHECK_HEADERS(ncurses.h) 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" if eval "test x$CURSES_LIB_NAME = x"
then then
AC_CHECK_LIB(ncurses, initscr, [CURSES_LIB="-lncurses" CURSES_LIB_NAME=ncurses]) 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" if eval "test x$CURSES_LIB_NAME = x"
then then
AC_CHECK_HEADERS(curses.h) 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" if eval "test x$CURSES_LIB_NAME = x"
then then
AC_CHECK_LIB(curses, initscr, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses]) AC_CHECK_LIB(curses, initscr, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses])