[Nano-devel] [PATCH] search ncurses via pkg-config first

[Mike Frysinger]

Newer ncurses installs include pkg-config files which tell us the right
-I/-L paths we need, so default to that before trying the legacy ways.

Signed-off-by: Mike Frysinger <address@hidden>
---
 configure.ac |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1f61ae4..05308be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,7 @@ AC_PROG_CC
 AC_PROG_LN_S
 AC_ISC_POSIX
 AC_SYS_LARGEFILE
+PKG_PROG_PKG_CONFIG
 
 dnl Internationalization macros.
 
@@ -439,6 +440,23 @@ AC_CHECK_FUNCS(getopt_long)
 dnl Checks for libraries.
 
 if eval "test x$CURSES_LIB_NAME = x"; then
+    if test x$enable_utf8 != xno; then
+       PKG_CHECK_MODULES([NCURSESW], [ncursesw], [
+           CURSES_LIB=$NCURSESW_LIBS
+           CPPFLAGS="$NCURSESW_CFLAGS $CPPFLAGS"
+           CURSES_LIB_NAME=ncursesw
+           CURSES_LIB_WIDE=yes
+       ], [:])
+    else
+       PKG_CHECK_MODULES([NCURSES], [ncurses], [
+           CURSES_LIB=$NCURSES_LIBS
+           CPPFLAGS="$NCURSES_CFLAGS $CPPFLAGS"
+           CURSES_LIB_NAME=ncurses
+       ], [:])
+    fi
+fi
+
+if eval "test x$CURSES_LIB_NAME = x"; then
     AC_CHECK_HEADERS(ncurses.h)
 
     if test x$enable_utf8 != xno; then
-- 
1.7.6.1