From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Thu, 4 Apr 2019 13:10:45 +0000 (+0200)
Subject: bump boost requirement to 1.42 unconditionally
X-Git-Tag: dnsdist-1.4.0-alpha1~24^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F7668%2Fhead;p=thirdparty%2Fpdns.git

bump boost requirement to 1.42 unconditionally
---

diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index 1013e0d437..36975d25e3 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 70aeaa2c62..fbad126428 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])])