From 431f0584579b6733ef1676fd0d4cfef1b332eea3 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Thu, 4 Apr 2019 15:10:45 +0200 Subject: [PATCH] bump boost requirement to 1.42 unconditionally --- pdns/dnsdistdist/configure.ac | 3 +-- pdns/recursordist/configure.ac | 9 +-------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac index 1013e0d43..36975d25e 100644 --- a/pdns/dnsdistdist/configure.ac +++ b/pdns/dnsdistdist/configure.ac @@ -35,8 +35,7 @@ PDNS_CHECK_SECURE_MEMSET PDNS_WITH_PROTOBUF -boost_required_version=1.42 -BOOST_REQUIRE([$boost_required_version]) +BOOST_REQUIRE([1.42]) PDNS_ENABLE_UNIT_TESTS PDNS_WITH_RE2 diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac index 70aeaa2c6..fbad12642 100644 --- a/pdns/recursordist/configure.ac +++ b/pdns/recursordist/configure.ac @@ -82,16 +82,9 @@ AC_DEFUN([PDNS_SELECT_CONTEXT_IMPL], [ PDNS_CHECK_CLOCK_GETTIME -boost_required_version=1.35 - PDNS_WITH_PROTOBUF -AS_IF([test "x$PROTOBUF_LIBS" != "x" -a x"$PROTOC" != "x"], - # The protobuf code needs boost::uuid, which is available from 1.42 onward - [AC_MSG_WARN([Bumping minimal Boost requirement to 1.42. To keep the requirement at 1.35, disable protobuf support]) - boost_required_version=1.42] -) -BOOST_REQUIRE([$boost_required_version]) +BOOST_REQUIRE([1.42]) # Check against flat_set header that requires boost >= 1.48 BOOST_FIND_HEADER([boost/container/flat_set.hpp], [AC_MSG_NOTICE([boost::container::flat_set not available, will fallback to std::set])]) -- 2.40.0