From 34eb951c576a604f8757f1a929befdacbb410831 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 29 Apr 2015 14:23:36 +0200
Subject: [PATCH] Remove all traces of optional C++2011 support

---
 configure.ac                  |  5 -----
 pdns/Makefile.am              | 22 +++++++++-------------
 pdns/dnsdistdist/configure.ac |  1 -
 pdns/test-dns_random_hh.cc    |  3 ++-
 4 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/configure.ac b/configure.ac
index f620cd677f..743c5b52d4 100644
--- 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 10f381e9bf..966f6d1d0e 100644
--- 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 64a18b10af..8825a7b948 100644
--- 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 e90e9f6fc6..137c465cfb 100644
--- 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"
-- 
2.47.2