mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-24 18:51:54 +00:00
Code Releases Activity

Merge remote-tracking branch 'origin/int-new' into bash-completion

Browse Source
This commit is contained in:
Jan Moskyto Matejka 2017-05-18 14:02:38 +02:00
commit 355b59e46d
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.in
View File

@ -130,9 +130,12 @@ $(objdir)/sysdep/paths.h: Makefile
tests_targets_ok = $(addsuffix .ok,$(tests_targets)) tests_targets_ok = $(addsuffix .ok,$(tests_targets))
$(tests_targets): %: %.o $(tests_objs) $(tests_targets): %: %.o $(tests_objs)
$(E)echo LD $(LDFLAGS) -o $@ $^ $(LIBS) $(E)echo LD $(LDFLAGS) -o $@ $< "..." $(LIBS)
$(Q)$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(Q)$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
# Hack to avoid problems with tests linking everything
$(tests_targets): LIBS += $(DAEMON_LIBS)
$(tests_targets_ok): %.ok: % $(tests_targets_ok): %.ok: %
$(Q)$* 2>/dev/null && touch $*.ok $(Q)$* 2>/dev/null && touch $*.ok

27
configure.ac
View File

@ -222,8 +222,8 @@ DAEMON_LIBS=
AC_SUBST(DAEMON_LIBS) AC_SUBST(DAEMON_LIBS)
if test "$enable_libssh" != no ; then if test "$enable_libssh" != no ; then
AC_CHECK_HEADER([libssh/libssh.h], [ ], [fail=yes], [ ]) AC_CHECK_HEADER([libssh/libssh.h], [true], [fail=yes], [ ])
AC_CHECK_LIB([ssh], [ssh_connect], [ ], [fail=yes]) AC_CHECK_LIB([ssh], [ssh_connect], [true], [fail=yes])
if test "$fail" != yes ; then if test "$fail" != yes ; then
AC_DEFINE([HAVE_LIBSSH], [1], [Define to 1 if you have the `ssh' library (-lssh).]) AC_DEFINE([HAVE_LIBSSH], [1], [Define to 1 if you have the `ssh' library (-lssh).])
@ -275,7 +275,11 @@ case $sysdesc in
AC_CHECK_HEADER([linux/rtnetlink.h], AC_CHECK_HEADER([linux/rtnetlink.h],
[], [],
[AC_MSG_ERROR([Appropriate version of Linux kernel headers not found.])], [AC_MSG_ERROR([Appropriate version of Linux kernel headers not found.])],
[] dnl Force new AC_CHECK_HEADER semantics [
dnl Some older versions of Linux kernel headers require these includes
#include <asm/types.h>
#include <sys/socket.h>
]
) )
;; ;;
esac esac
@ -334,7 +338,7 @@ if test "$enable_client" = yes ; then
AC_CHECK_HEADERS([curses.h], AC_CHECK_HEADERS([curses.h],
[], [],
[AC_MSG_ERROR([The client requires ncurses library. Either install the library or use --disable-client to compile without the client.])], [AC_MSG_ERROR([The client requires ncurses library. Either install the library or use --disable-client to compile without the client.])],
[] dnl Force new AC_CHECK_HEADER semantics [AC_INCLUDES_DEFAULT]
) )
AC_SEARCH_LIBS([tgetent], [tinfo tinfow ncurses curses termcap], AC_SEARCH_LIBS([tgetent], [tinfo tinfow ncurses curses termcap],
@ -345,12 +349,7 @@ if test "$enable_client" = yes ; then
AC_CHECK_HEADERS([readline/readline.h readline/history.h], AC_CHECK_HEADERS([readline/readline.h readline/history.h],
[], [],
[AC_MSG_ERROR([The client requires GNU Readline library. Either install the library or use --disable-client to compile without the client.])], [AC_MSG_ERROR([The client requires GNU Readline library. Either install the library or use --disable-client to compile without the client.])],
[] dnl Force new AC_CHECK_HEADER semantics [AC_INCLUDES_DEFAULT]
)
AC_SEARCH_LIBS([add_history], [history],
[HISTORY_LIBS="$LIBS"; LIBS=""],
[AC_MSG_ERROR([The client requires GNU Readline library. Either install the library or use --disable-client to compile without the client.])],
) )
AC_SEARCH_LIBS([rl_callback_read_char], [readline], AC_SEARCH_LIBS([rl_callback_read_char], [readline],
@ -359,6 +358,12 @@ if test "$enable_client" = yes ; then
[$TINFO_LIBS] [$TINFO_LIBS]
) )
AC_SEARCH_LIBS([add_history], [history readline],
[HISTORY_LIBS="$LIBS"; LIBS=""],
[AC_MSG_ERROR([The client requires GNU Readline library. Either install the library or use --disable-client to compile without the client.])],
[$TINFO_LIBS]
)
AC_CHECK_LIB([readline], [rl_crlf], AC_CHECK_LIB([readline], [rl_crlf],
[AC_DEFINE([HAVE_RL_CRLF], [1], [Define to 1 if you have rl_crlf()])], [AC_DEFINE([HAVE_RL_CRLF], [1], [Define to 1 if you have rl_crlf()])],
[], [],
@ -372,7 +377,7 @@ if test "$enable_client" = yes ; then
) )
LIBS="$BASE_LIBS" LIBS="$BASE_LIBS"
CLIENT_LIBS="$READLINE_LIBS $HISTORY_LIBS $TINFO_LIBS" CLIENT_LIBS="$HISTORY_LIBS $READLINE_LIBS $TINFO_LIBS"
fi fi
AC_SUBST([CLIENT]) AC_SUBST([CLIENT])
AC_SUBST([CLIENT_LIBS]) AC_SUBST([CLIENT_LIBS])