circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
confusion.
This commit is contained in:
Nicholas Marriott
2015-12-11 19:58:09 +00:00
parent 2a3456cd3b
commit 38cc1a1843
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
configure.ac
View File

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

4
tty-term.c
View File

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