protozero: make internal includes work

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index d327e6fbfbad610bb5d53a97b8de584654bb32eb..a45d93c38bba8c3975362b7a51d8226cb46b274c 100644 (file)
--- 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 be29ab34ee9138c0542291259f1419570db929e9..6f01d6677d8772e6d630ac051b6c222903ae6b3f 100644 (file)
--- 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 45c1003eb5bd54d5ac2ef415fee92ce1dac77956..954f2d0bf25f4653b41da112d2402b8131fbb734 100644 (file)
--- 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 f5e2d150be5e1b73577dc377f303c720e1d7679a..dae785d9cb1bf82b056725211759e6818c1d72a2 100644 (file)
--- 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 b4f53f1df7e5d1ce6ef2287090bce991a6540be1..54fd1622137f30d855cb7b381b3ea4ba5c290241 100644 (file)
--- 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)