From 917db12a0d101de56e03dfd612ca5ddac5bce6c1 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Thu, 26 Oct 2017 12:10:15 +0200 Subject: [PATCH] Use libsodium's CFLAGS, we might need them to find the includes --- pdns/Makefile.am | 4 ++++ pdns/dnsdistdist/Makefile.am | 2 +- pdns/recursordist/Makefile.am | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pdns/Makefile.am b/pdns/Makefile.am index e0140eb5c..cfba818f9 100644 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@ -39,6 +39,10 @@ if GSS_TSIG AM_CPPFLAGS +=$(GSS_CFLAGS) endif +if LIBSODIUM +AM_CPPFLAGS +=$(LIBSODIUM_CFLAGS) +endif + EXTRA_DIST = \ dnslabeltext.rl \ dnslabeltext.cc \ diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am index b983e70ad..ce49afb03 100644 --- a/pdns/dnsdistdist/Makefile.am +++ b/pdns/dnsdistdist/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS += $(SYSTEMD_CFLAGS) $(LUA_CFLAGS) $(LIBEDIT_CFLAGS) $(YAHTTP_CFLAGS) $(SANITIZER_FLAGS) $(NET_SNMP_CFLAGS) -DSYSCONFDIR=\"${sysconfdir}\" +AM_CPPFLAGS += $(SYSTEMD_CFLAGS) $(LUA_CFLAGS) $(LIBEDIT_CFLAGS) $(LIBSODIUM_CFLAGS) $(YAHTTP_CFLAGS) $(SANITIZER_FLAGS) $(NET_SNMP_CFLAGS) -DSYSCONFDIR=\"${sysconfdir}\" ACLOCAL_AMFLAGS = -I m4 diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am index a3ab6121f..582cad658 100644 --- a/pdns/recursordist/Makefile.am +++ b/pdns/recursordist/Makefile.am @@ -1,6 +1,6 @@ JSON11_LIBS = $(top_srcdir)/ext/json11/libjson11.la -AM_CPPFLAGS = $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) $(BOTAN110_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 += \ -I$(top_srcdir)/ext/json11 \ -- 2.40.0