From 29cc80e5cda22bb5801ead8d002cc9c00f262d48 Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 15 Jan 2021 13:39:42 +0100
Subject: [PATCH] auth, rec, dnsdist: always show sanitizers in C[XX]FLAGS in
 configure output

---
 configure.ac                   | 1 +
 pdns/dnsdistdist/Makefile.am   | 3 ---
 pdns/dnsdistdist/configure.ac  | 4 ++--
 pdns/recursordist/configure.ac | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 590e3accf6..2747079c4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -304,6 +304,7 @@ AC_SUBST([YAHTTP_LIBS], ['$(top_builddir)/ext/yahttp/yahttp/libyahttp.la'])
 AC_SUBST([IPCRYPT_CFLAGS], ['-I$(top_srcdir)/ext/ipcrypt'])
 AC_SUBST([IPCRYPT_LIBS], ['$(top_builddir)/ext/ipcrypt/libipcrypt.la'])
 
+CFLAGS="$SANITIZER_FLAGS $CFLAGS"
 CXXFLAGS="$SANITIZER_FLAGS $CXXFLAGS"
 
 AC_ARG_VAR(PACKAGEVERSION, [The version used in secpoll queries])
diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index 812d8e1e01..e39eddb850 100644
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -4,7 +4,6 @@ AM_CPPFLAGS += $(SYSTEMD_CFLAGS) \
 	$(LIBSODIUM_CFLAGS) \
 	$(FSTRM_CFLAGS) \
 	$(YAHTTP_CFLAGS) \
-	$(SANITIZER_FLAGS) \
 	$(NET_SNMP_CFLAGS) \
 	$(LIBCAP_CFLAGS) \
 	-DSYSCONFDIR=\"${sysconfdir}\"
@@ -289,7 +288,6 @@ dnsdist_LDADD = \
 	$(YAHTTP_LIBS) \
 	$(LIBSODIUM_LIBS) \
 	$(FSTRM_LIBS) \
-	$(SANITIZER_FLAGS) \
 	$(SYSTEMD_LIBS) \
 	$(NET_SNMP_LIBS) \
 	$(LIBCAP_LIBS) \
@@ -307,7 +305,6 @@ testrunner_LDADD = \
 	$(LIBSODIUM_LIBS) \
 	$(LUA_LIBS) \
 	$(RT_LIBS) \
-	$(SANITIZER_FLAGS) \
 	$(LIBCAP_LIBS)
 
 if HAVE_CDB
diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index cba6cc6853..c4e4d0b77d 100644
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -128,8 +128,8 @@ AM_COND_IF([HAVE_MANPAGES],[],[
 
 LDFLAGS="$RELRO_LDFLAGS $LDFLAGS"
 
-CFLAGS="$PIE_CFLAGS $CFLAGS"
-CXXFLAGS="$PIE_CFLAGS $CXXFLAGS"
+CFLAGS="$SANITIZER_FLAGS $PIE_CFLAGS $CFLAGS"
+CXXFLAGS="$SANITIZER_FLAGS $PIE_CFLAGS $CXXFLAGS"
 
 PROGRAM_LDFLAGS="$PIE_LDFLAGS $PROGRAM_LDFLAGS"
 AC_SUBST([PROGRAM_LDFLAGS])
diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac
index 4b05096fd2..6ce96679a3 100644
--- a/pdns/recursordist/configure.ac
+++ b/pdns/recursordist/configure.ac
@@ -157,7 +157,7 @@ AC_SUBST([YAHTTP_CFLAGS], ['-I$(top_srcdir)/ext/yahttp'])
 AC_SUBST([YAHTTP_LIBS], ['$(top_builddir)/ext/yahttp/yahttp/libyahttp.la'])
 
 LDFLAGS="$RELRO_LDFLAGS $LDFLAGS"
-CFLAGS="$PIE_CFLAGS $CFLAGS"
+CFLAGS="$SANITIZER_FLAGS $PIE_CFLAGS $CFLAGS"
 CXXFLAGS="$SANITIZER_FLAGS $PIE_CFLAGS $CXXFLAGS"
 PROGRAM_LDFLAGS="$PIE_LDFLAGS $PROGRAM_LDFLAGS"
 AC_SUBST([PROGRAM_LDFLAGS])
-- 
2.47.2