diff options
| author | Lucian Cristian <lucian.cristian@gmail.com> | 2019-09-13 06:12:34 +0200 |
|---|---|---|
| committer | Lucian Cristian <lucian.cristian@gmail.com> | 2019-09-13 06:12:34 +0200 |
| commit | 2163a630eb737b9afe3277dccf44070ef55dea12 (patch) | |
| tree | a73b1a127a1b0981845982a3fb1d35af103aee94 /configure.ac | |
| parent | Merge pull request #4968 from rubenk/fix-surname (diff) | |
| download | frr-2163a630eb737b9afe3277dccf44070ef55dea12.tar.xz frr-2163a630eb737b9afe3277dccf44070ef55dea12.zip | |
clippy: CARES fail only if !enable_clippy_only
test for CARES otherwise config will fail with conditional "CARES" not defined
Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
Diffstat (limited to 'configure.ac')
| -rwxr-xr-x | configure.ac | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 6c1b35b5f..9f37b3e9a 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" ;; *) |