]> granicus.if.org Git - pdns/commitdiff
auth: Don't build dnsbulktest and dnstcpbench if boost is too old
authorRemi Gacogne <remi.gacogne@powerdns.com>
Mon, 6 Jun 2016 13:59:19 +0000 (15:59 +0200)
committerRemi Gacogne <remi.gacogne@powerdns.com>
Mon, 6 Jun 2016 13:59:19 +0000 (15:59 +0200)
configure.ac
pdns/Makefile.am

index 5e41bee834302994e6b9211aee87a5194a30cf8d..379ec7c40bf46c7df559ebcadaa710f2f6e89bc5 100644 (file)
@@ -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
index 7332a7c80f28efed14356366e8e2a188443eb55a..4434692c61fc5423aee7faf12c4739a3d9c050dd 100644 (file)
@@ -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 = \