use pkg-config for ncurses by default

Newer ncurses install pkg-config files, so search those first.  If they
aren't found, fall back to existing detection logic.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/configure.ac b/configure.ac
index f6a24a64096e151218069db839c043bc1642bccd..792222cdf918bba9a33173dbdc9ab34e8d95a8c4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,7 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PROG_LN_S
+PKG_PROG_PKG_CONFIG
 
 AC_SUBST([WITH_WATCH8BIT])
 AC_ARG_ENABLE([watch8bit],
@@ -133,19 +134,23 @@ AC_ARG_WITH([ncurses],
 if test "x$with_ncurses" = xno; then
   AM_CONDITIONAL(WITH_NCURSES, false)
 else
-  AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no])
-  AC_CHECK_HEADERS(curses.h ncurses.h term.h, [], [have_ncurses=no], AC_INCLUDES_DEFAULT)
-  if test "x$have_ncurses" = xno; then
-    AC_MSG_ERROR([ncurses support missing/incomplete (for partial build use --without-ncurses)])
-  fi
+  PKG_CHECK_MODULES([NCURSES], [ncurses], [], [
+    AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no])
+    AC_CHECK_HEADERS(curses.h ncurses.h term.h, [], [have_ncurses=no], AC_INCLUDES_DEFAULT)
+    if test "x$have_ncurses" = xno; then
+      AC_MSG_ERROR([ncurses support missing/incomplete (for partial build use --without-ncurses)])
+    fi
+    NCURSES_LIBS="-lncurses"
+  ])
   AM_CONDITIONAL(WITH_NCURSES, true)
   if test "$enable_watch8bit" = yes; then
-    AC_CHECK_LIB([ncursesw], [addwstr], [WATCH_NCURSES_LIBS=-lncursesw],
-                [AC_MSG_ERROR([Cannot find ncurses wide library ncursesw with --enable-watch8bit])])
+    PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"], [
+      AC_CHECK_LIB([ncursesw], [addwstr], [WATCH_NCURSES_LIBS=-lncursesw],
+                   [AC_MSG_ERROR([Cannot find ncurses wide library ncursesw with --enable-watch8bit])])
+    ])
   else
-    WATCH_NCURSES_LIBS="-lncurses"
+    WATCH_NCURSES_LIBS="$NCURSES_LIBS"
   fi
-  NCURSES_LIBS="-lncurses"
 fi
 AC_SUBST([NCURSES_LIBS])
 AC_SUBST([WATCH_NCURSES_LIBS])