diff options
| -rw-r--r-- | configure.ac | 21 | ||||
| -rw-r--r-- | lib/subdir.am | 2 |
2 files changed, 20 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 2c38a63411..42b3b659a7 100644 --- a/configure.ac +++ b/configure.ac @@ -1590,8 +1590,17 @@ if test "$ac_cv_have_decl_TCP_MD5SIG" = "no"; then AC_CHECK_DECLS([TCP_MD5SIG], [], [], MD5_INCLUDES)]) fi -AC_CHECK_LIB([crypt], [crypt], [], - [AC_CHECK_LIB([crypto], [DES_crypt])]) +LIBS_save="$LIBS" +AC_CHECK_LIB([crypt], [crypt], [], [ + AC_CHECK_LIB([crypto], [DES_crypt]) +]) +LIBCRYPT="$LIBS" +LIBCRYPT="${LIBCRYPT%$LIBS_save}" +LIBCRYPT="${LIBCRYPT#$LIBS_save}" +AC_SUBST([LIBCRYPT]) +LIBS="$LIBS_save" +unset LIBS_save + AC_CHECK_LIB([resolv], [res_init]) dnl --------------------------- @@ -2045,6 +2054,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "rtrlib/rtrlib.h"]], dnl --------------- dnl dlopen & dlinfo dnl --------------- +LIBS_save="$LIBS" AC_SEARCH_LIBS([dlopen], [dl dld], [], [ AC_MSG_ERROR([unable to find the dlopen()]) ]) @@ -2091,6 +2101,13 @@ if test "$frr_cv_rtld_di_linkmap" = "yes"; then AC_DEFINE([HAVE_DLINFO_LINKMAP], [1], [Have dlinfo RTLD_DI_LINKMAP]) fi +LIBDL="$LIBS" +LIBDL="${LIBDL%$LIBS_save}" +LIBDL="${LIBDL#$LIBS_save}" +AC_SUBST([LIBDL]) +LIBS="$LIBS_save" +unset LIBS_save + dnl ########################################################################## dnl test "$enable_clippy_only" != "yes" fi diff --git a/lib/subdir.am b/lib/subdir.am index dab5fb9e83..52eeda81ce 100644 --- a/lib/subdir.am +++ b/lib/subdir.am @@ -3,7 +3,7 @@ # lib_LTLIBRARIES += lib/libfrr.la lib_libfrr_la_LDFLAGS = $(LIB_LDFLAGS) -version-info 0:0:0 -Xlinker -e_libfrr_version -lib_libfrr_la_LIBADD = $(LIBCAP) $(UNWIND_LIBS) $(LIBYANG_LIBS) $(LUA_LIB) $(UST_LIBS) $(LIBM) +lib_libfrr_la_LIBADD = $(LIBCAP) $(UNWIND_LIBS) $(LIBYANG_LIBS) $(LUA_LIB) $(UST_LIBS) $(LIBCRYPT) $(LIBDL) $(LIBM) lib_libfrr_la_SOURCES = \ lib/agg_table.c \ |