- Fix #3451: dnstap not building when you have a separate build dir.

  And removed protoc warning, set dnstap.proto syntax to proto2.

git-svn-id: file:///svn/unbound/trunk@4508 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/Makefile.in b/Makefile.in
index 87f62931332caf1ddb0480cbf619c0ad6ffbe924..06d485c08071f59f356aa35cb7dfe093a835e7b3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -389,7 +389,7 @@ dnstap.lo dnstap.o: $(srcdir)/dnstap/dnstap.c config.h dnstap/dnstap_config.h \
 
 dnstap/dnstap.pb-c.c dnstap/dnstap.pb-c.h: $(srcdir)/dnstap/dnstap.proto
        @-if test ! -d dnstap; then $(INSTALL) -d dnstap; fi
-       $(PROTOC_C) --c_out=. $(srcdir)/dnstap/dnstap.proto
+       $(PROTOC_C) --c_out=. --proto_path=$(srcdir) $(srcdir)/dnstap/dnstap.proto
 
 dnstap.pb-c.lo dnstap.pb-c.o: dnstap/dnstap.pb-c.c dnstap/dnstap.pb-c.h
 

diff --git a/dnstap/dnstap.proto b/dnstap/dnstap.proto
index 32871f409cfcdbc27522f93eeb759b8be310564e..88bfb4e9412995d4e68eb80baaa92fddea7756c4 100644 (file)
--- a/dnstap/dnstap.proto
+++ b/dnstap/dnstap.proto
@@ -13,6 +13,7 @@
 // with this file. If not, see:
 //
 // <http://creativecommons.org/publicdomain/zero/1.0/>.
+syntax = "proto2";
 
 package dnstap;
 

diff --git a/doc/Changelog b/doc/Changelog
index 77f6e2036636425b2c347c5e55e47607df47805c..97ed5e6984f8d007edf3f3daaeec77f32446308a 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+5 February 2018: Wouter
+       - Fix #3451: dnstap not building when you have a separate build dir.
+         And removed protoc warning, set dnstap.proto syntax to proto2.
+
 2 February 2018: Wouter
        - Fix unfreed locks in log and arc4random at exit of unbound.
        - unit test with valgrind