summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2017-02-07 13:40:36 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2017-02-07 13:40:36 +0000
commit0f5a2c86da5cf2cf024b0653fb84f2dc69c246a2 (patch)
treea92d688789f97aea1b0c5cae5de4c8faff9baf28 /configure.ac
parent4eabd7ec90756952ea4963cdd5d508224a7f1d29 (diff)
Look for libtinfo before libncurses.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac20
1 files changed, 14 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 6e848be6..acfc5886 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,26 +162,34 @@ fi
# Look for ncurses.
PKG_CHECK_MODULES(
- LIBNCURSES,
- ncurses,
+ LIBTINFO,
+ tinfo,
found_ncurses=yes,
found_ncurses=no
)
if test "x$found_ncurses" = xno; then
PKG_CHECK_MODULES(
LIBNCURSES,
+ ncurses,
+ found_ncurses=yes,
+ found_ncurses=no
+ )
+fi
+if test "x$found_ncurses" = xno; then
+ PKG_CHECK_MODULES(
+ LIBNCURSES,
ncursesw,
found_ncurses=yes,
found_ncurses=no
)
fi
if test "x$found_ncurses" = xyes; then
- CPPFLAGS="$LIBNCURSES_CFLAGS $CPPFLAGS"
- LIBS="$LIBNCURSES_LIBS $LIBS"
+ CPPFLAGS="$LIBNCURSES_CFLAGS $LIBTINFO_CFLAGS $CPPFLAGS"
+ LIBS="$LIBNCURSES_LIBS $LIBTINFO_LIBS $LIBS"
else
# pkg-config didn't work, try ncurses.
AC_CHECK_LIB(
- ncurses,
+ [tinfo ncurses],
setupterm,
found_ncurses=yes,
found_ncurses=no
@@ -211,7 +219,7 @@ else
LIBS="$LIBS -lcurses"
AC_DEFINE(HAVE_CURSES_H)
else
- AC_MSG_ERROR("curses or ncurses not found")
+ AC_MSG_ERROR("curses not found")
fi
fi