From f4e26d174e66252e0382a4d525bb174ff5b7daad Mon Sep 17 00:00:00 2001 From: Chris Allegretta Date: Thu, 10 Jan 2013 03:51:24 +0000 Subject: [PATCH] 2013-01-02 Mike Frysinger * 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 --- ChangeLog | 3 +++ configure.ac | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 19f0ebce..b3c2eafe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2013-01-02 Mike Frysinger + * configure.ac: Check for ncursesw5-config and base $CPPFLAGS based on it. + 2013-01-09 Fabian Groffen * configure.ac, src/nano.h: Make search for ncursesw more generalized. diff --git a/configure.ac b/configure.ac index e999e415..c6c5e523 100644 --- a/configure.ac +++ b/configure.ac @@ -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 -- 2.39.5