diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-09-24 14:14:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-24 14:14:45 +0200 |
| commit | d3fc71f30437fb0cb85dbdfe7d2d146a5f07000c (patch) | |
| tree | 313c27d18bf774c1404610b281568030356328f4 /configure.ac | |
| parent | Merge pull request #5039 from opensourcerouting/isisd-yang-state-data (diff) | |
| parent | clippy: fail libcap test only when !enable_clippy_only (diff) | |
| download | frr-d3fc71f30437fb0cb85dbdfe7d2d146a5f07000c.tar.xz frr-d3fc71f30437fb0cb85dbdfe7d2d146a5f07000c.zip | |
Merge pull request #4912 from lucize/carescross
clippy: don't fail on CARES and libcap when clippy-only selected
Diffstat (limited to 'configure.ac')
| -rwxr-xr-x | configure.ac | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index c45a81936..88f1c4f62 100755 --- a/configure.ac +++ b/configure.ac @@ -1452,6 +1452,12 @@ if test "x$enable_pcreposix" = "xyes"; then fi AC_SUBST([HAVE_LIBPCREPOSIX]) +dnl ########################################################################## +dnl test "${enable_clippy_only}" != "yes" +fi +dnl END OF LARGE if block +dnl ########################################################################## + dnl ------------------ dnl check C-Ares library dnl ------------------ @@ -1462,12 +1468,6 @@ PKG_CHECK_MODULES([CARES], [libcares], [ ]) AM_CONDITIONAL([CARES], [$c_ares_found]) -dnl ########################################################################## -dnl test "${enable_clippy_only}" != "yes" -fi -dnl END OF LARGE if block -dnl ########################################################################## - dnl ---------------------------------------------------------------------------- dnl figure out if domainname is available in the utsname struct (GNU extension). @@ -1535,9 +1535,11 @@ case "$host_os" in no) ;; yes) + if test "${enable_clippy_only}" != "yes"; then if test "$c_ares_found" != "true" ; then AC_MSG_ERROR([nhrpd requires libcares. Please install c-ares and its -dev headers.]) fi + fi NHRPD="nhrpd" ;; *) @@ -2041,9 +2043,11 @@ if test "${enable_capabilities}" != "no"; then case "$host_os" in linux*) + if test "${enable_clippy_only}" != "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.]) fi + fi ;; esac else |