From: Pieter Lexis Date: Mon, 20 May 2019 14:44:05 +0000 (+0200) Subject: Check for libcurl when tools are enabled X-Git-Tag: dnsdist-1.4.0-beta1~3^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b488c73cf7f8d016acb75413daa4e8e954655c0f;p=thirdparty%2Fpdns.git Check for libcurl when tools are enabled --- diff --git a/configure.ac b/configure.ac index 1c00fff975..501661e6a7 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 0000000000..1221c61367 --- /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. + ]) +])