From: Ondřej Surý <ondrej@sury.org>
Date: Mon, 6 Mar 2017 11:54:40 +0000 (+0100)
Subject: dnstap module also needs protobuf-c compiler (protoc-c)
X-Git-Tag: v1.3.0~23^2~62^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=598c17cfe621cff0e877d6a8c59fb51861750457;p=thirdparty%2Fknot-resolver.git

dnstap module also needs protobuf-c compiler (protoc-c)
---

diff --git a/Makefile b/Makefile
index e4f5dbe61..ef757509c 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,7 @@ $(eval $(call find_lib,gnutls))
 $(eval $(call find_lib,libedit))
 $(eval $(call find_lib,libprotobuf-c,1))
 $(eval $(call find_lib,libfstrm,0.2))
+$(eval $(call find_bin,protoc-c))
 
 # Lookup SONAME
 $(eval $(call find_soname,libknot))
@@ -74,7 +75,7 @@ endif
 endif
 
 # check for fstrm and protobuf for dnstap
-ifeq ($(HAS_libfstrm)|$(HAS_libprotobuf-c),yes|yes)
+ifeq ($(HAS_libfstrm)|$(HAS_libprotobuf-c)|$(HAS_protoc-c),yes|yes|yes)
 ENABLE_DNSTAP := yes
 endif
 
@@ -121,6 +122,7 @@ info:
 	$(info [$(HAS_libedit)] libedit (client))
 	$(info [$(HAS_libfstrm)] libfstrm (modules/dnstap))
 	$(info [$(HAS_libprotobuf-c)] libprotobuf-c (modules/dnstap))
+	$(info [$(HAS_protoc-c)] proto-c (modules/dnstap))
 	$(info )
 
 # Verify required dependencies are met, as listed above
diff --git a/modules/dnstap/dnstap.mk b/modules/dnstap/dnstap.mk
index d77f149c2..c0486f393 100644
--- a/modules/dnstap/dnstap.mk
+++ b/modules/dnstap/dnstap.mk
@@ -1,5 +1,5 @@
 dnstap_CFLAGS := -fvisibility=hidden -fPIC
-dnstap_SOURCES := modules/dnstap/dnstap.c modules/dnstap/dnstap.pb-c.c
+dnstap_SOURCES := modules/dnstap/dnstap.pb-c.c modules/dnstap/dnstap.c
 dnstap_DEPEND := $(libkres)
 dnstap_LIBS := $(contrib_TARGET) $(libkres_TARGET) $(libkres_LIBS) $(libprotobuf-c_LIBS) $(libfstrm_LIBS)
 $(call make_c_module,dnstap)