2013-01-02 Mike Frysinger <vapier@gentoo.org>

* configure.ac: Check for ncursesw5-config and base $CPPFLAGS based on it.



git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4562 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Chris Allegretta 2013-01-10 03:51:24 +00:00
parent 2e4228f78e
commit f4e26d174e
2 changed files with 12 additions and 1 deletions

View File

@ -1,3 +1,6 @@
2013-01-02 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Check for ncursesw5-config and base $CPPFLAGS based on it.
2013-01-09 Fabian Groffen <grobian@Savannah>
* configure.ac, src/nano.h: Make search for ncursesw more generalized.

View File

@ -442,7 +442,15 @@ if eval "test x$CURSES_LIB_NAME = x"; then
if test x$enable_utf8 != xno; then
AC_CHECK_HEADERS(ncursesw/ncurses.h)
AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
AC_CHECK_TOOL(NCURSESW_CONFIG, ncursesw5-config, no)
if test "x$NCURSESW_CONFIG" != xno; then
CURSES_LIB=`$NCURSESW_CONFIG --libs`
CPPFLAGS="`$NCURSESW_CONFIG --cflags` $CPPFLAGS"
CURSES_LIB_NAME=ncursesw
CURSES_LIB_WIDE=yes
else
AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
fi
fi
if eval "test x$CURSES_LIB_NAME = x"; then