From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 18 Dec 2018 09:07:51 +0000 (+0100)
Subject: dnsscope: Fix boost's version detection, build with histograms
X-Git-Tag: rec-4.2.0-alpha1~72^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F7291%2Fhead;p=thirdparty%2Fpdns.git

dnsscope: Fix boost's version detection, build with histograms
---

diff --git a/configure.ac b/configure.ac
index ce85a2f160..8c83ab90aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,6 +110,9 @@ 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])
+AS_IF([test "$boost_major_version" -ge 148], [
+  AC_DEFINE(HAVE_BOOST_GE_148, [1], [Define to 1 if you have boost >= 1.48])
+])
 
 BOOST_PROGRAM_OPTIONS([mt])
 AS_IF([test "$boost_cv_lib_program_options" = "no"], [
diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 838af8dd0f..fb8ee579a8 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -989,7 +989,6 @@ dnsreplay_SOURCES = \
 	dnswriter.cc dnswriter.hh \
 	ednsoptions.cc ednsoptions.hh \
 	ednssubnet.cc ednssubnet.hh \
-	histog.hh \
 	iputils.cc \
 	logger.cc \
 	misc.cc \
@@ -1081,6 +1080,7 @@ dnsscope_SOURCES = \
 	dnsrecords.cc \
 	dnsscope.cc \
 	dnswriter.cc dnswriter.hh \
+	histog.hh \
 	logger.cc \
 	misc.cc \
 	nsecrecords.cc \