Remove all traces of optional C++2011 support

diff --git a/configure.ac b/configure.ac
index f620cd677fb791334c7dec56ca684bc3c00c1a1e..743c5b52d48f254a81e646ff4b281bac3dbf49e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,6 @@ AS_IF([test "x$with_luajit" = "xno"], [
 ])
 
 AX_CXX_COMPILE_STDCXX_11()
-AM_CONDITIONAL([CXX2011],[test "$HAVE_CXX11" = "1"])
 
 AC_MSG_CHECKING([whether we will enable compiler security checks])
 AC_ARG_ENABLE([hardening],
@@ -406,8 +405,4 @@ AS_IF([test "x$LUAPC" != "x"],
   [AC_MSG_NOTICE([Lua support: $LUAPC])],
   [AC_MSG_NOTICE([Lua support: no])]
 )
-AS_IF([test "$HAVE_CXX11" = "1"],
-  [AC_MSG_NOTICE([C++2011 support: yes])],
-  [AC_MSG_NOTICE([C++2011 support: no])]
-)
 AC_MSG_NOTICE([])

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 10f381e9bf0726f16a68d6dfdc00df2a38558e5c..966f6d1d0e66f83261ee6aaf3dd1c7442fddde98 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -74,22 +74,20 @@ bin_PROGRAMS = \
 
 if TOOLS
 bin_PROGRAMS += \
+       calidns\
        dnsbulktest \
+       dnsdist \
        dnsgram \
        dnsreplay \
        dnsscan \
        dnsscope \
        dnstcpbench \
        dnswasher \
+       dumresp \
        notify \
        nproxy \
        nsec3dig \
        saxfr
-
-if CXX2011
-bin_PROGRAMS += dnsdist calidns dumresp
-endif
-
 endif
 
 EXTRA_PROGRAMS = \
@@ -936,6 +934,8 @@ testrunner_SOURCES = \
        dns_random.cc \
        dnsbackend.cc \
        dnslabeltext.cc \
+       dnsname.cc \
+       dnsname.hh \
        dnspacket.cc \
        dnsparser.cc \
        dnsrecords.cc \
@@ -947,6 +947,7 @@ testrunner_SOURCES = \
        misc.cc \
        nameserver.cc \
        nsecrecords.cc \
+       packetcache.cc \
        qtype.cc \
        rcpgenerator.cc \
        responsestats.cc \
@@ -956,6 +957,7 @@ testrunner_SOURCES = \
        test-base64_cc.cc \
        test-bindparser_cc.cc \
        test-dns_random_hh.cc \
+       test-dnsname_cc.cc \
        test-dnsrecords_cc.cc \
        test-iputils_hh.cc \
        test-md5_hh.cc \
@@ -963,21 +965,15 @@ testrunner_SOURCES = \
        test-nameserver_cc.cc \
        test-packetcache_cc.cc \
        test-rcpgenerator_cc.cc \
+       test-sha_hh.cc \
        test-sholder_hh.cc \
        test-statbag_cc.cc \
        test-zoneparser_tng_cc.cc \
        testrunner.cc \
-       test-sha_hh.cc \
-       packetcache.cc \
-       unix_utility.cc \
        ueberbackend.cc \
+       unix_utility.cc \
        zoneparser-tng.cc zoneparser-tng.hh
 
-if CXX2011
-testrunner_SOURCES += test-dnsname_cc.cc dnsname.cc dnsname.hh
-endif
-
-
 testrunner_LDFLAGS = \
        $(AM_LDFLAGS) \
        $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) \

diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index 64a18b10af735c2e767ad6a9aa9897910d9c9b23..8825a7b94821e323dcab8e92c1621b5a25d6f98c 100644 (file)
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -14,7 +14,6 @@ AC_SUBST([YAHTTP_CFLAGS], ['-I$(top_srcdir)/pdns/ext/yahttp'])
 AC_SUBST([YAHTTP_LIBS], ['-L$(top_builddir)/pdns/ext/yahttp/yahttp -lyahttp'])
 PDNS_WITH_LUA
 AX_CXX_COMPILE_STDCXX_11(ext,mandatory)
-AM_CONDITIONAL([CXX2011],[test "$HAVE_CXX11" = "1"])
 
 AC_CONFIG_FILES([Makefile
        pdns/ext/yahttp/Makefile

diff --git a/pdns/test-dns_random_hh.cc b/pdns/test-dns_random_hh.cc
index e90e9f6fc675b600ae6fe0ecd36ede48b62592a3..137c465cfbd8561b9528f3f6829fef2a23f01f58 100644 (file)
--- a/pdns/test-dns_random_hh.cc
+++ b/pdns/test-dns_random_hh.cc
@@ -1,7 +1,8 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_NO_MAIN
-#ifndef HAVE_CXX11 
 
+// Disable this code for gcc 4.8 and lower
+#if (__GNUC__ == 4 && __GNUC_MINOR__ > 8) || !__GNUC__
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"