circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-13 18:38:48 +00:00
Code Issues Projects Releases Wiki Activity

PKG_CHECK_MODULES needs to be separate.

Browse Source
This commit is contained in:
Nicholas Marriott 2021-01-17 19:03:18 +00:00
parent 607594f6e5
commit 4148417a2a
1 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
configure.ac
View File

@ -184,9 +184,21 @@ AC_LIBOBJ(getopt)
# Look for libevent. Try libevent_core or libevent with pkg-config first then # Look for libevent. Try libevent_core or libevent with pkg-config first then
# look for the library. # look for the library.
PKG_CHECK_MODULES(
LIBEVENT_CORE,
[libevent_core >= 2],
[
AM_CPPFLAGS="$LIBEVENT_CORE_CFLAGS $AM_CPPFLAGS"
CPPFLAGS="$AM_CPPFLAGS $SAVED_CPPFLAGS"
LIBS="$LIBEVENT_CORE_LIBS $LIBS"
found_libevent=yes
],
found_libevent=no
)
if test x$found_libevent = xno; then
PKG_CHECK_MODULES( PKG_CHECK_MODULES(
LIBEVENT, LIBEVENT,
[libevent_core >= 2 libevent >= 2], [libevent >= 2],
[ [
AM_CPPFLAGS="$LIBEVENT_CFLAGS $AM_CPPFLAGS" AM_CPPFLAGS="$LIBEVENT_CFLAGS $AM_CPPFLAGS"
CPPFLAGS="$AM_CPPFLAGS $SAVED_CPPFLAGS" CPPFLAGS="$AM_CPPFLAGS $SAVED_CPPFLAGS"
@ -195,6 +207,7 @@ PKG_CHECK_MODULES(
], ],
found_libevent=no found_libevent=no
) )
fi
if test x$found_libevent = xno; then if test x$found_libevent = xno; then
AC_SEARCH_LIBS( AC_SEARCH_LIBS(
event_init, event_init,
@ -221,16 +234,43 @@ fi
# Look for ncurses or curses. Try pkg-config first then directly for the # Look for ncurses or curses. Try pkg-config first then directly for the
# library. # library.
PKG_CHECK_MODULES( PKG_CHECK_MODULES(
LIBNCURSES, LIBTINFO,
[tinfo ncurses ncursesw], tinfo,
found_ncurses=yes, [
AM_CPPFLAGS="$LIBTINFO_CFLAGS $AM_CPPFLAGS"
CPPFLAGS="$LIBTINFO_CFLAGS $SAVED_CPPFLAGS"
LIBS="$LIBTINFO_LIBS $LIBS"
found_ncurses=yes
],
found_ncurses=no found_ncurses=no
) )
if test "x$found_ncurses" = xyes; then if test "x$found_ncurses" = xno; then
AM_CPPFLAGS="$LIBNCURSES_CFLAGS $LIBTINFO_CFLAGS $AM_CPPFLAGS" PKG_CHECK_MODULES(
CPPFLAGS="$LIBNCURSES_CFLAGS $LIBTINFO_CFLAGS $SAVED_CPPFLAGS" LIBNCURSES,
LIBS="$LIBNCURSES_LIBS $LIBTINFO_LIBS $LIBS" ncurses,
else [
AM_CPPFLAGS="$LIBNCURSES_CFLAGS $AM_CPPFLAGS"
CPPFLAGS="$LIBNCURSES_CFLAGS $SAVED_CPPFLAGS"
LIBS="$LIBNCURSES_LIBS $LIBS"
found_ncurses=yes
],
found_ncurses=no
)
fi
if test "x$found_ncurses" = xno; then
PKG_CHECK_MODULES(
LIBNCURSESW,
ncursesw,
[
AM_CPPFLAGS="$LIBNCURSESW_CFLAGS $AM_CPPFLAGS"
CPPFLAGS="$LIBNCURSESW_CFLAGS $SAVED_CPPFLAGS"
LIBS="$LIBNCURSESW_LIBS $LIBS"
found_ncurses=yes
],
found_ncurses=no
)
fi
if test "x$found_ncurses" = xno; then
AC_SEARCH_LIBS( AC_SEARCH_LIBS(
setupterm, setupterm,
[tinfo ncurses ncursesw], [tinfo ncurses ncursesw],