From: Remi Gacogne <rgacogne@users.noreply.github.com>
Date: Fri, 27 Oct 2017 14:03:28 +0000 (+0200)
Subject: Merge branch 'master' into botan-2
X-Git-Tag: auth-4.1.0-rc2~4^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3acbaddf0557a9460136f3bdcad23ba08df8822;p=pdns

Merge branch 'master' into botan-2
---

a3acbaddf0557a9460136f3bdcad23ba08df8822
diff --cc pdns/recursordist/Makefile.am
index ac0312759,582cad658..7b440bfe5
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@@ -1,6 -1,6 +1,6 @@@
  JSON11_LIBS = $(top_srcdir)/ext/json11/libjson11.la
  
- AM_CPPFLAGS = $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) $(BOTAN_CFLAGS) $(NET_SNMP_CFLAGS) $(SANITIZER_FLAGS) -O3 -Wall -pthread -DSYSCONFDIR=\"${sysconfdir}\" $(SYSTEMD_CFLAGS)
 -AM_CPPFLAGS = $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) $(BOTAN110_CFLAGS) $(LIBSODIUM_CFLAGS) $(NET_SNMP_CFLAGS) $(SANITIZER_FLAGS) -O3 -Wall -pthread -DSYSCONFDIR=\"${sysconfdir}\" $(SYSTEMD_CFLAGS)
++AM_CPPFLAGS = $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) $(BOTAN_CFLAGS) $(LIBSODIUM_CFLAGS) $(NET_SNMP_CFLAGS) $(SANITIZER_FLAGS) -O3 -Wall -pthread -DSYSCONFDIR=\"${sysconfdir}\" $(SYSTEMD_CFLAGS)
  
  AM_CPPFLAGS += \
  	-I$(top_srcdir)/ext/json11 \