proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-17 19:05:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4912 from lucize/carescross

Browse Source 
clippy: don't fail on CARES and libcap when clippy-only selected
This commit is contained in:
Donald Sharp 2019-09-24 08:14:45 -04:00 committed by GitHub
commit d3fc71f304
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -1452,6 +1452,12 @@ if test "x$enable_pcreposix" = "xyes"; then
fi fi
AC_SUBST([HAVE_LIBPCREPOSIX]) AC_SUBST([HAVE_LIBPCREPOSIX])
dnl ##########################################################################
dnl test "${enable_clippy_only}" != "yes"
fi
dnl END OF LARGE if block
dnl ##########################################################################
dnl ------------------ dnl ------------------
dnl check C-Ares library dnl check C-Ares library
dnl ------------------ dnl ------------------
@ -1462,12 +1468,6 @@ PKG_CHECK_MODULES([CARES], [libcares], [
]) ])
AM_CONDITIONAL([CARES], [$c_ares_found]) AM_CONDITIONAL([CARES], [$c_ares_found])
dnl ##########################################################################
dnl test "${enable_clippy_only}" != "yes"
fi
dnl END OF LARGE if block
dnl ##########################################################################
dnl ---------------------------------------------------------------------------- dnl ----------------------------------------------------------------------------
dnl figure out if domainname is available in the utsname struct (GNU extension). dnl figure out if domainname is available in the utsname struct (GNU extension).
@ -1535,9 +1535,11 @@ case "$host_os" in
no) no)
;; ;;
yes) yes)
if test "${enable_clippy_only}" != "yes"; then
if test "$c_ares_found" != "true" ; then if test "$c_ares_found" != "true" ; then
AC_MSG_ERROR([nhrpd requires libcares. Please install c-ares and its -dev headers.]) AC_MSG_ERROR([nhrpd requires libcares. Please install c-ares and its -dev headers.])
fi fi
fi
NHRPD="nhrpd" NHRPD="nhrpd"
;; ;;
*) *)
@ -2041,9 +2043,11 @@ if test "${enable_capabilities}" != "no"; then
case "$host_os" in case "$host_os" in
linux*) linux*)
if test "${enable_clippy_only}" != "yes"; then
if test "$frr_ac_lcaps" != "yes"; then if test "$frr_ac_lcaps" != "yes"; then
AC_MSG_ERROR([libcap and/or its headers were not found. Running FRR without libcap support built in causes a huge performance penalty.]) AC_MSG_ERROR([libcap and/or its headers were not found. Running FRR without libcap support built in causes a huge performance penalty.])
fi fi
fi
;; ;;
esac esac
else else