From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 1 Oct 2019 12:42:17 +0000 (+0200)
Subject: Auto, conditional on availability of boot-filesystem lib
X-Git-Tag: dnsdist-1.4.0-rc4~52^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=934a9500965b02aefcd614421de0e3948bb8b766;p=pdns

Auto, conditional on availability of boot-filesystem lib
---

diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac
index 6d05754ba..dadad499c 100644
--- a/pdns/recursordist/configure.ac
+++ b/pdns/recursordist/configure.ac
@@ -108,12 +108,6 @@ 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='${localstatedir}/lib/pdns-recursor'
 AC_ARG_WITH([nod-cache-dir],
diff --git a/pdns/recursordist/m4/pdns_enable_nod.m4 b/pdns/recursordist/m4/pdns_enable_nod.m4
index f298ceecc..e70a7f47c 100644
--- a/pdns/recursordist/m4/pdns_enable_nod.m4
+++ b/pdns/recursordist/m4/pdns_enable_nod.m4
@@ -3,17 +3,27 @@ AC_DEFUN([PDNS_ENABLE_NOD],[
 
   AC_ARG_ENABLE([nod],
     AS_HELP_STRING([--enable-nod],
-      [enable newly observed domains @<:@default=yes@:>@]
+      [enable newly observed domains @<:@default=auto@:>@]
     ),
     [enable_nod=$enableval],
-    [enable_nod=yes]
+    [enable_nod=auto]
   )
 
-  AS_IF([test "x$enable_nod" != "xno"],
-    [AC_DEFINE([NOD_ENABLED], [1], [Define to 1 if nod is enabled])]
+  BOOST_FILESYSTEM([], [no])
+
+  AS_IF([test "x$enable_nod" = "xyes"], [
+    AS_IF([test "x$BOOST_FILESYSTEM_LIBS" = "x"],
+      [AC_MSG_ERROR([Boost filesystem library required by NOD is not installed])])
+  ]
   )
+  AS_IF([test "x$enable_nod" = "xauto"], [
+    AS_IF([test "x$BOOST_FILESYSTEM_LIBS" != "x"],
+       [enable_nod="yes"], [enable_nod="no"])
+  ])
 
-  AM_CONDITIONAL([NOD_ENABLED], [test "x$enable_nod" != "xno"])
+  AM_CONDITIONAL([NOD_ENABLED], [test "x$enable_nod" = "xyes"])
+  AS_IF([test "x$enable_nod" = "xyes"], [AC_DEFINE([NOD_ENABLED],
+             [1], [Define to 1 if nod is enabled])])
 
   AC_MSG_RESULT([$enable_nod])
 ])