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

diff --git a/configure.ac b/configure.ac
index ce85a2f1600231a21858a81e8b218b32370308b2..8c83ab90aa60bcc75be6743c2b163a640bb09b4f 100644 (file)
--- 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 838af8dd0f80d7ebf617b0f8baa2a51f505af370..fb8ee579a8d3467addb003acfed0f2c32bb783ec 100644 (file)
--- 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 \