From 0f5a2c86da5cf2cf024b0653fb84f2dc69c246a2 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Tue, 7 Feb 2017 13:40:36 +0000
Subject: Look for libtinfo before libncurses.

---
 configure.ac | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 6e848be6..acfc5886 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,11 +162,19 @@ 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,
@@ -176,12 +184,12 @@ if test "x$found_ncurses" = xno; then
 	)
 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
 
-- 
cgit