diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-05-17 17:37:27 +0200 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-05-17 17:37:27 +0200 |
| commit | 9b701e69cc812260788eced3370c7e65cd0e25fe (patch) | |
| tree | 7f5e161599c0c9f9e58bfde43893aa5ca7631d4e /configure.ac | |
| parent | d19617f06b4526bccc2fc5e5e15c43c754b99a4d (diff) | |
| parent | d6e01ff90024fcee259eb145f38a0f5b000e4798 (diff) | |
| download | bird-9b701e69cc812260788eced3370c7e65cd0e25fe.tar.gz | |
Merge branch 'master' into int-new
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index afadac2e..9ae119b4 100644 --- a/configure.ac +++ b/configure.ac @@ -275,7 +275,11 @@ case $sysdesc in AC_CHECK_HEADER([linux/rtnetlink.h], [], [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 @@ -334,7 +338,7 @@ if test "$enable_client" = yes ; then 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.])], - [] dnl Force new AC_CHECK_HEADER semantics + [AC_INCLUDES_DEFAULT] ) AC_SEARCH_LIBS([tgetent], [tinfo tinfow ncurses curses termcap], @@ -345,16 +349,17 @@ if test "$enable_client" = yes ; then 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.])], - [] dnl Force new AC_CHECK_HEADER semantics + [AC_INCLUDES_DEFAULT] ) - AC_SEARCH_LIBS([add_history], [history], - [HISTORY_LIBS="$LIBS"; LIBS=""], + AC_SEARCH_LIBS([rl_callback_read_char], [readline], + [READLINE_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_SEARCH_LIBS([rl_callback_read_char], [readline], - [READLINE_LIBS="$LIBS"; 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] ) @@ -372,7 +377,7 @@ if test "$enable_client" = yes ; then ) LIBS="$BASE_LIBS" - CLIENT_LIBS="$READLINE_LIBS $HISTORY_LIBS $TINFO_LIBS" + CLIENT_LIBS="$HISTORY_LIBS $READLINE_LIBS $TINFO_LIBS" fi AC_SUBST([CLIENT]) AC_SUBST([CLIENT_LIBS]) |