From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Mon, 6 Jun 2016 13:59:19 +0000 (+0200)
Subject: auth: Don't build dnsbulktest and dnstcpbench if boost is too old
X-Git-Tag: rec-4.0.0-rc1~15^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6cedc26df014c19276da9600b46419d64ccf7e70;p=pdns

auth: Don't build dnsbulktest and dnstcpbench if boost is too old
---

diff --git a/configure.ac b/configure.ac
index 5e41bee83..379ec7c40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,6 +102,10 @@ PDNS_CHECK_RAGEL
 PDNS_CHECK_CLOCK_GETTIME
 
 BOOST_REQUIRE([1.35])
+# Boost accumulators, as used by dnsbulktest and dnstcpbench, need 1.48+
+# to be compatible with C++11
+AM_CONDITIONAL([HAVE_BOOST_GE_148], [test "$boost_major_version" -ge 148])
+
 BOOST_PROGRAM_OPTIONS([mt])
 PDNS_ENABLE_UNIT_TESTS
 PDNS_ENABLE_REPRODUCIBLE
diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 7332a7c80..4434692c6 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -78,12 +78,10 @@ bin_PROGRAMS = \
 
 if TOOLS
 bin_PROGRAMS += \
-	dnsbulktest \
 	dnsgram \
 	dnsreplay \
 	dnsscan \
 	dnsscope \
-	dnstcpbench \
 	dnswasher \
 	dumresp \
 	notify \
@@ -98,6 +96,12 @@ if HAVE_RECVMMSG
 bin_PROGRAMS += calidns
 endif
 
+if HAVE_BOOST_GE_148
+bin_PROGRAMS += \
+	dnsbulktest \
+	dnstcpbench
+endif
+
 endif
 
 EXTRA_PROGRAMS = \