From b488c73cf7f8d016acb75413daa4e8e954655c0f Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 20 May 2019 16:44:05 +0200
Subject: [PATCH] Check for libcurl when tools are enabled

---
 configure.ac            | 10 +---------
 m4/pdns_enable_tools.m4 | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 m4/pdns_enable_tools.m4

diff --git a/configure.ac b/configure.ac
index 1c00fff97..501661e6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,15 +225,7 @@ 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_ENABLE_TOOLS
 PDNS_ENABLE_IXFRDIST
 
 PDNS_WITH_PROTOBUF
diff --git a/m4/pdns_enable_tools.m4 b/m4/pdns_enable_tools.m4
new file mode 100644
index 000000000..1221c6136
--- /dev/null
+++ b/m4/pdns_enable_tools.m4
@@ -0,0 +1,15 @@
+AC_DEFUN([PDNS_ENABLE_TOOLS], [
+  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"])
+
+  AS_IF([test "x$enable_tools" != "xno"], [
+    PDNS_CHECK_LIBCURL() dnl We only care about the #define HAVE_LIBCURL and can build tools without DOH support.
+  ])
+])
-- 
2.49.0