circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 14:27:09 +00:00
Code Issues Projects Releases Wiki Activity

Look for libtinfo before libncurses.

Browse Source
This commit is contained in:
Nicholas Marriott
2017-02-07 13:40:36 +00:00
parent 4eabd7ec90
commit 0f5a2c86da
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@ -162,11 +162,19 @@ fi
# Look for ncurses. # Look for ncurses.
PKG_CHECK_MODULES( PKG_CHECK_MODULES(
LIBNCURSES, LIBTINFO,
ncurses, tinfo,
found_ncurses=yes, found_ncurses=yes,
found_ncurses=no 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 if test "x$found_ncurses" = xno; then
PKG_CHECK_MODULES( PKG_CHECK_MODULES(
LIBNCURSES, LIBNCURSES,
@ -176,12 +184,12 @@ if test "x$found_ncurses" = xno; then
) )
fi fi
if test "x$found_ncurses" = xyes; then if test "x$found_ncurses" = xyes; then
CPPFLAGS="$LIBNCURSES_CFLAGS $CPPFLAGS" CPPFLAGS="$LIBNCURSES_CFLAGS $LIBTINFO_CFLAGS $CPPFLAGS"
LIBS="$LIBNCURSES_LIBS $LIBS" LIBS="$LIBNCURSES_LIBS $LIBTINFO_LIBS $LIBS"
else else
# pkg-config didn't work, try ncurses. # pkg-config didn't work, try ncurses.
AC_CHECK_LIB( AC_CHECK_LIB(
ncurses, [tinfo ncurses],
setupterm, setupterm,
found_ncurses=yes, found_ncurses=yes,
found_ncurses=no found_ncurses=no
@ -211,7 +219,7 @@ else
LIBS="$LIBS -lcurses" LIBS="$LIBS -lcurses"
AC_DEFINE(HAVE_CURSES_H) AC_DEFINE(HAVE_CURSES_H)
else else
AC_MSG_ERROR("curses or ncurses not found") AC_MSG_ERROR("curses not found")
fi fi
fi fi