hopefully fix build without protobuf on travis

diff --git a/.travis.yml b/.travis.yml
index a5227b1d856215f52ed95703264e271948c6ff69..09c78cc325b9e9d00a02133c0ddcb5dcc5bf3017 100644 (file)
--- 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 e06e28bf51d637bdc87088b1c72227aca4672c1d..055de8d35ee21b8a1b544abdc90de71e44d59fb7 100644 (file)
--- 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) \