boost 1.76 containers: use standard exceptions

(cherry picked from commit 311f26839819062ced8697686372b6c6b2210bdf)

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 237a48f501f99a1c54423ef70b7324f7a408b1fa..f073f052600e3a2a6e039a4d05c192d1f96c0aaa 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -6,7 +6,8 @@ AM_CPPFLAGS += \
        $(LIBEDIT_CFLAGS) \
        $(LIBCRYPTO_INCLUDES) \
        $(SYSTEMD_CFLAGS) \
-       $(YAML_CFLAGS)
+       $(YAML_CFLAGS) \
+       -DBOOST_CONTAINER_USE_STD_EXCEPTIONS
 
 AM_CXXFLAGS = \
        -DSYSCONFDIR=\"$(sysconfdir)\" \

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index b0ca67ad4245007a82776c7e56936db21831415e..7143be30e38392a174da91023be0aa608265397e 100644 (file)
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS += $(SYSTEMD_CFLAGS) $(LUA_CFLAGS) $(LIBEDIT_CFLAGS) $(LIBSODIUM_CFLAGS) $(FSTRM_CFLAGS) $(YAHTTP_CFLAGS) $(SANITIZER_FLAGS) $(NET_SNMP_CFLAGS) $(LIBCAP_CFLAGS) -DSYSCONFDIR=\"${sysconfdir}\"
+AM_CPPFLAGS += $(SYSTEMD_CFLAGS) $(LUA_CFLAGS) $(LIBEDIT_CFLAGS) $(LIBSODIUM_CFLAGS) $(FSTRM_CFLAGS) $(YAHTTP_CFLAGS) $(SANITIZER_FLAGS) $(NET_SNMP_CFLAGS) $(LIBCAP_CFLAGS) -DSYSCONFDIR=\"${sysconfdir}\" -DBOOST_CONTAINER_USE_STD_EXCEPTIONS
 
 ACLOCAL_AMFLAGS = -I m4
 

diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index e7e437c08385cbe92b0913919d01179f0156325d..036bdccd817cffcd06c8cc2f6bea9f13ecf5f384 100644 (file)
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -6,7 +6,8 @@ AM_CPPFLAGS = $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) $(LIBSODIUM_CFLAG
 AM_CPPFLAGS += \
        -I$(top_srcdir)/ext/json11 \
        $(YAHTTP_CFLAGS) \
-       $(LIBCRYPTO_INCLUDES)
+       $(LIBCRYPTO_INCLUDES) \
+       -DBOOST_CONTAINER_USE_STD_EXCEPTIONS
 
 AM_CXXFLAGS = \
        -DSYSCONFDIR=\"$(sysconfdir)\" \