From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 29 Jan 2021 22:51:45 +0000 (+0100)
Subject: protozero: make internal includes work
X-Git-Tag: dnsdist-1.6.0-alpha1~2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10030%2Fhead;p=thirdparty%2Fpdns.git

protozero: make internal includes work
---

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index d327e6fbfb..a45d93c38b 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -6,7 +6,8 @@ AM_CPPFLAGS += \
 	$(LIBEDIT_CFLAGS) \
 	$(LIBCRYPTO_INCLUDES) \
 	$(SYSTEMD_CFLAGS) \
-	$(YAML_CFLAGS)
+	$(YAML_CFLAGS) \
+	-I$(top_srcdir)/ext/protozero/include
 
 AM_CXXFLAGS = \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index be29ab34ee..6f01d6677d 100644
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS += $(SYSTEMD_CFLAGS) \
 	$(YAHTTP_CFLAGS) \
 	$(NET_SNMP_CFLAGS) \
 	$(LIBCAP_CFLAGS) \
+	-I$(top_srcdir)/ext/protozero/include \
 	-DSYSCONFDIR=\"${sysconfdir}\"
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/pdns/dnstap.cc b/pdns/dnstap.cc
index 45c1003eb5..954f2d0bf2 100644
--- a/pdns/dnstap.cc
+++ b/pdns/dnstap.cc
@@ -3,7 +3,7 @@
 #include "gettime.hh"
 #include "dnstap.hh"
 
-#include "ext/protozero/include/protozero/pbf_writer.hpp"
+#include <protozero/pbf_writer.hpp>
 
 namespace DnstapBaseFields {
   enum : protozero::pbf_tag_type { identity = 1, version = 2, extra = 3, message = 14, type = 15 };
diff --git a/pdns/protozero.hh b/pdns/protozero.hh
index f5e2d150be..dae785d9cb 100644
--- a/pdns/protozero.hh
+++ b/pdns/protozero.hh
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-#include "ext/protozero/include/protozero/pbf_writer.hpp"
+#include <protozero/pbf_writer.hpp>
 
 #include "config.h"
 #include "iputils.hh"
diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index b4f53f1df7..54fd162213 100644
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -5,6 +5,7 @@ AM_CPPFLAGS = $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) $(LIBSODIUM_CFLAG
 
 AM_CPPFLAGS += \
 	-I$(top_srcdir)/ext/json11 \
+	-I$(top_srcdir)/ext/protozero/include \
 	$(YAHTTP_CFLAGS) \
 	$(LIBCRYPTO_INCLUDES)