From: Wouter Wijngaards Date: Mon, 5 Feb 2018 12:14:51 +0000 (+0000) Subject: - Fix #3451: dnstap not building when you have a separate build dir. X-Git-Tag: release-1.7.0rc1~53 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf6f33ceaf7d8c2df6a753460783fc45ee5aa465;p=thirdparty%2Funbound.git - 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 87f629313..06d485c08 100644 --- 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 32871f409..88bfb4e94 100644 --- a/dnstap/dnstap.proto +++ b/dnstap/dnstap.proto @@ -13,6 +13,7 @@ // with this file. If not, see: // // . +syntax = "proto2"; package dnstap; diff --git a/doc/Changelog b/doc/Changelog index 77f6e2036..97ed5e698 100644 --- 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