From 87ddd1b1040d7c0774221c631ee1f8397391f836 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Fri, 2 Sep 2016 15:38:47 +0200
Subject: [PATCH] Auth: allow --with-(dyn-)modules=no

Fixes #4399
---
 configure.ac | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index 98d6f4fc50..14a6fa4cb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,6 +136,13 @@ PDNS_ENABLE_VERBOSE_LOGGING
 PDNS_ENABLE_PKCS11
 PDNS_ENABLE_GSS_TSIG
 
+AC_SUBST([socketdir])
+socketdir="/var/run"
+AC_ARG_WITH([socketdir],
+  [AS_HELP_STRING([--with-socketdir], [where the controlsocket lives @<:@default=/var/run@:>@])],
+  [socketdir="$withval"]
+)
+
 modules="bind gmysql random"
 AC_ARG_WITH([modules],
   [AS_HELP_STRING([--with-modules], [which backends to compile with @<:@default=bind gmysql random@:>@])],
@@ -148,29 +155,13 @@ AC_ARG_WITH([dynmodules],
   [dynmodules="$withval"]
 )
 
-AC_SUBST([socketdir])
-socketdir="/var/run"
-AC_ARG_WITH([socketdir],
-  [AS_HELP_STRING([--with-socketdir], [where the controlsocket lives @<:@default=/var/run@:>@])],
-  [socketdir="$withval"]
-)
-
 AC_SUBST([moduledirs])
 AC_SUBST([moduleobjects])
 AC_SUBST([modulelibs])
 AC_DEFINE_UNQUOTED([PDNS_MODULES], "$modules", [Built-in modules])
 
-AC_MSG_CHECKING([whether we will be building and installing the extra tools])
-AC_ARG_ENABLE([tools],
-  [AS_HELP_STRING([--enable-tools], [if we should build and install the tools @<:@default=no@:>@])],
-  [enable_tools=$enableval],
-  [enable_tools=no]
-)
-
-AC_MSG_RESULT([$enable_tools])
-AM_CONDITIONAL([TOOLS], [test "x$enable_tools" != "xno"])
-
-PDNS_WITH_PROTOBUF
+AS_IF([test x"$modules" = "xno"], [modules=""])
+AS_IF([test x"$dynmodules" = "xno"], [dynmodules=""])
 
 for a in $modules $dynmodules; do
   case "$a" in
@@ -222,6 +213,19 @@ done
 
 PDNS_ENABLE_REMOTEBACKEND_ZEROMQ
 
+AC_MSG_CHECKING([whether we will be building and installing the extra tools])
+AC_ARG_ENABLE([tools],
+  [AS_HELP_STRING([--enable-tools], [if we should build and install the tools @<:@default=no@:>@])],
+  [enable_tools=$enableval],
+  [enable_tools=no]
+)
+
+AC_MSG_RESULT([$enable_tools])
+AM_CONDITIONAL([TOOLS], [test "x$enable_tools" != "xno"])
+
+PDNS_WITH_PROTOBUF
+
+
 AM_CONDITIONAL([ORACLE], [test "x$needoracle" = "xyes"])
 
 AM_CONDITIONAL([LDAP], [test "x$needldap" = "xyes"])
-- 
2.47.2