From: bert hubert <bert.hubert@netherlabs.nl>
Date: Sat, 26 Mar 2016 08:07:25 +0000 (+0100)
Subject: hopefully fix build without protobuf on travis
X-Git-Tag: dnsdist-1.0.0-beta1~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee2ba7b280ff1449ee70933c04be55e47ec7b714;p=thirdparty%2Fpdns.git

hopefully fix build without protobuf on travis
---

diff --git a/.travis.yml b/.travis.yml
index a5227b1d85..09c78cc325 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -198,7 +198,7 @@ script:
   - test -f modules/remotebackend/test-suite.log && cat modules/remotebackend/test-suite.log || true
 
   #DNSName - make -k -j3 -C pdns $(grep '(EXEEXT):' pdns/Makefile | cut -f1 -d\$ | grep -E -v 'dnsdist|calidns')
-  - make -k -j3 -C pdns $(grep '(EXEEXT):' pdns/Makefile | cut -f1 -d\$ | grep -E -v 'dnsdist|calidns|speedtest')
+  - make -k -j3 -C pdns $(grep '(EXEEXT):' pdns/Makefile | cut -f1 -d\$ | grep -E -v 'dnspcap2protobuf|dnsdist|calidns|speedtest')
 
   - cd pdns
   - ./pdnsutil test-algorithms
diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index e06e28bf51..055de8d35e 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -41,6 +41,7 @@ endif
 EXTRA_DIST = \
 	dnslabeltext.rl \
 	dnslabeltext.cc \
+	dnsmessage.proto \
 	effective_tld_names.dat \
 	mtasker.cc \
 	inflighter.cc \
@@ -1017,7 +1018,6 @@ dnspcap2protobuf_SOURCES = \
 	base32.cc \
 	base64.cc base64.hh \
 	dnslabeltext.cc \
-	dnsmessage.pb.cc dnsmessage.pb.h \
 	dnsname.cc dnsname.hh \
 	dnsparser.cc dnsparser.hh \
 	dnspcap.cc dnspcap.hh \
@@ -1034,6 +1034,8 @@ dnspcap2protobuf_SOURCES = \
 	unix_utility.cc \
 	utility.hh
 
+nodist_dnspcap2protobuf_SOURCES=dnsmessage.pb.cc dnsmessage.pb.h 
+
 dnspcap2protobuf_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	$(OPENSSL_LDFLAGS) \