Merge pull request #2943 from ahupowerdns/deforeach

author bert hubert <bert.hubert@netherlabs.nl>

Fri, 27 Nov 2015 22:13:57 +0000 (23:13 +0100)

committer bert hubert <bert.hubert@netherlabs.nl>

Fri, 27 Nov 2015 22:13:57 +0000 (23:13 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Fri, 27 Nov 2015 22:13:57 +0000 (23:13 +0100)
committer bert hubert <bert.hubert@netherlabs.nl>
Fri, 27 Nov 2015 22:13:57 +0000 (23:13 +0100)
diff --cc configure.ac

index 6f0bdfa626d8f650d52340d9cba829e29f32c4ad,48f05ea1a4af78c15f868fc615facc388ea144dd..77da1915a678304311b2625d9625d582e292c8a3
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -113,8 -113,9 +113,7 @@@ PDNS_CHECK_LIBSODIU
   PDNS_CHECK_CLOCK_GETTIME
   
   BOOST_REQUIRE([1.35])
- BOOST_FOREACH
   BOOST_PROGRAM_OPTIONS([mt])
- -BOOST_SERIALIZATION([mt])
- -
   PDNS_ENABLE_UNIT_TESTS
   PDNS_ENABLE_REPRODUCIBLE
   
diff --cc pdns/ueberbackend.cc
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Fri, 27 Nov 2015 22:13:57 +0000 (23:13 +0100)
committer	bert hubert <bert.hubert@netherlabs.nl>
	Fri, 27 Nov 2015 22:13:57 +0000 (23:13 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/ueberbackend.cc	patch \|	diff1 \|	diff2 \|	blob \| history