Look for ncurses with PKG_CONFIG, and remove libtinfo because it just causes

confusion.
pull/243/head
Nicholas Marriott 2015-12-11 19:58:09 +00:00
parent 2a3456cd3b
commit 38cc1a1843
2 changed files with 19 additions and 9 deletions

View File

@ -1,6 +1,5 @@
# configure.ac
# Miscellaneous bits.
AC_INIT(tmux, 2.2)
AC_CONFIG_AUX_DIR(etc)
@ -143,12 +142,23 @@ if test "x$found_libevent" = xno; then
AC_MSG_ERROR("libevent not found")
fi
# Look for curses.
AC_SEARCH_LIBS(
setupterm,
[terminfo curses ncurses tinfo],
found_curses=yes,
found_curses=no
# Look for ncurses
PKG_CHECK_MODULES(
LIBNCURSES,
ncurses,
[
CPPFLAGS="$LIBNCURSES_CFLAGS $CPPFLAGS"
LIBS="$LIBNCURSES_LIBS $LIBS"
found_curses=yes
],
[
AC_SEARCH_LIBS(
setupterm,
[ncurses curses terminfo],
found_curses=yes,
found_curses=no
)
]
)
if test "x$found_curses" = xno; then
AC_MSG_ERROR("curses not found")

View File

@ -18,9 +18,9 @@
#include <sys/types.h>
#ifdef HAVE_CURSES_H
#if defined(HAVE_CURSES_H)
#include <curses.h>
#else
#elif defined(HAVE_NCURSES_H)
#include <ncurses.h>
#endif
#include <fnmatch.h>