From: Neil Cook <neil.cook@noware.co.uk>
Date: Tue, 24 Jul 2018 14:07:31 +0000 (+0200)
Subject: Fix incorrect tests for NOD in configure
X-Git-Tag: dnsdist-1.3.3~184^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F6802%2Fhead;p=thirdparty%2Fpdns.git

Fix incorrect tests for NOD in configure
---

diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac
index 9fd1fd6851..adbb49cbbb 100644
--- a/pdns/recursordist/configure.ac
+++ b/pdns/recursordist/configure.ac
@@ -78,12 +78,6 @@ AC_DEFUN([PDNS_SELECT_CONTEXT_IMPL], [
   fi
 ])
 
-AS_IF([test "x$NOD_ENABLED" != "xn"],
-  [
-  BOOST_FILESYSTEM
-  AS_IF([test -z "$BOOST_FILESYSTEM_LIBS"], [ AC_MSG_ERROR([Boost filesystem library is not installed])])],
-  [])
-
 PDNS_CHECK_CLOCK_GETTIME
 
 boost_required_version=1.35
@@ -146,6 +140,12 @@ AC_ARG_WITH([socketdir],
 
 PDNS_ENABLE_NOD
 
+AM_COND_IF([NOD_ENABLED],
+  [
+  BOOST_FILESYSTEM
+  AS_IF([test -z "$BOOST_FILESYSTEM_LIBS"], [ AC_MSG_ERROR([Boost filesystem library is not installed])])],
+  [])
+
 AC_SUBST([nodcachedir])
 nodcachedir='${prefix}/var/lib/pdns-recursor'
 AC_ARG_WITH([nod-cache-dir],
@@ -248,7 +248,7 @@ AS_IF([test "x$systemd" != "xn"],
   [AC_MSG_NOTICE([systemd: yes])],
   [AC_MSG_NOTICE([systemd: no])]
 )
-AS_IF([test "x$NOD_ENABLED" != "xn"],
+AM_COND_IF([NOD_ENABLED],
   [AC_MSG_NOTICE([nod: yes])],
   [AC_MSG_NOTICE([nod: no])]
 )