fixing makefile to compile protobuf if dnstap is enabled

diff --git a/Makefile b/Makefile
index 167fbde704dbc46022f969374bc9215e387bb38d..88cb655bc803fa34bcd996e128f3dd8a1c031809 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ endif
 endif
 
 # check for fstrm and protobuf for dnstap
-ifeq ($(HAS_libfstrm)&$(HAS_libprotobuf-c),yes&yes)
+ifeq ($(HAS_libfstrm)|$(HAS_libprotobuf-c),yes|yes)
 BUILD_CFLAGS += -DENABLE_DNSTAP
 ENABLE_DNSTAP := yes
 endif

diff --git a/contrib/contrib.mk b/contrib/contrib.mk
index 3cb685c5b78c3ed21e43802c1837b1050e4ebd7f..bebb472bc552e20fa463c8736daa074f12f559ca 100644 (file)
--- a/contrib/contrib.mk
+++ b/contrib/contrib.mk
@@ -6,8 +6,7 @@ contrib_SOURCES := \
        contrib/ucw/mempool.c \
        contrib/murmurhash3/murmurhash3.c \
        contrib/base32hex.c \
-       contrib/base64.c \
-       contrib/dnstap/dnstap.pb-c.c
+       contrib/base64.c
 contrib_CFLAGS := -fPIC
 contrib_TARGET := $(abspath contrib)/contrib$(AREXT)
 
@@ -19,4 +18,8 @@ contrib_CFLAGS  += -pthread
 contrib_LIBS    += -pthread
 endif
 
+ifeq ($(ENABLE_DNSTAP), yes)
+contrib_SOURCES += contrib/dnstap/dnstap.pb-c.c
+endif
+
 $(eval $(call make_static,contrib,contrib))