From 5f23f136321612a54f205fb09b4e1c0463507115 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 28 Aug 2015 15:00:29 +0200 Subject: [PATCH] Try to detect ncurses using pkg-config In case tinfo code is split out from libncurses into libtinfo it is more reliable to use pkg-config to detect all libs need for proper linking Signed-off-by: Justin Lecher --- configure.ac | 26 +++++++++++++++----------- src/Makefile.am | 2 ++ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 9cf6a53..cbc649d 100644 --- a/configure.ac +++ b/configure.ac @@ -18,17 +18,21 @@ AC_PROG_CC # Platform specific ncurses check. AC_CANONICAL_HOST -AS_CASE([$host_os], - [darwin*], - [ - AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])]) - AC_CHECK_HEADER(curses.h) - ], - [ - AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])]) - AC_CHECK_HEADER(ncursesw/curses.h) - ] -) +PKG_CHECK_MODULES([NCURSES], [ncursesw], [], [ + PKG_CHECK_MODULES([NCURSES], [ncurses], [], [ + AS_CASE([$host_os], + [darwin*], + [ + AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])]) + AC_CHECK_HEADER(curses.h) + ], + [ + AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])]) + AC_CHECK_HEADER(ncursesw/curses.h) + ] + ) + ]) +]) # Checks for libraries. AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])]) diff --git a/src/Makefile.am b/src/Makefile.am index 5765613..ee411a9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,3 +15,5 @@ hh_SOURCES = \ hstr_regexp.c include/hstr_regexp.h \ radixsort.c include/radixsort.h \ hstr.c + +hh_LDADD = $(NCURSES_LIBS)