Jerry/bird
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into int-new

Browse source
This commit is contained in:
Ondrej Zajicek (work) 2017-05-17 17:37:27 +02:00
parent d19617f06b d6e01ff900
commit 9b701e69cc
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
configure.ac
View file

@ -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])