From 81d510b12750670281dda2c5d22b771009e1a7d7 Mon Sep 17 00:00:00 2001 From: Neil Cook Date: Tue, 24 Jul 2018 16:07:31 +0200 Subject: [PATCH] Fix incorrect tests for NOD in configure --- pdns/recursordist/configure.ac | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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])] ) -- 2.47.2