]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
dnstap module also needs protobuf-c compiler (protoc-c)
authorOndřej Surý <ondrej@sury.org>
Mon, 6 Mar 2017 11:54:40 +0000 (12:54 +0100)
committerOndřej Surý <ondrej@sury.org>
Mon, 6 Mar 2017 11:54:40 +0000 (12:54 +0100)
Makefile
modules/dnstap/dnstap.mk

index e4f5dbe61513ed5c21db2783441e830793fa882c..ef757509cac8f01b4cf758d5e7cfe4db040c7613 100644 (file)
--- 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
index d77f149c2d981528bc2486f12a0e2da7e4ebf448..c0486f3930cf93ff85f71baa0025c2062e53a3c7 100644 (file)
@@ -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)