From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 14 Jan 2016 10:08:47 +0000 (+0100)
Subject: Remove dnsdist from auth tarball
X-Git-Tag: dnsdist-1.0.0-alpha2~78^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa5becb6adf725980b175a7ca5d808547a45a430;p=pdns

Remove dnsdist from auth tarball

This ensures any files _only_ needed for dnsdist are not distributed,
that dnsdist (htmlfiles.h specifically) cannot be built from the tarball.

But still allow building dnsdist from the repository root.
---

diff --git a/configure.ac b/configure.ac
index 6f827490e..ed0f732b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -322,6 +322,10 @@ PDNS_ENABLE_COVERAGE
 PDNS_ENABLE_SANITIZERS
 PDNS_ENABLE_MALLOC_TRACE
 
+# Test if the pdns/dnsdistdist/html directory exists, so `make dnsdist` from the
+# repo root can still work.
+AM_CONDITIONAL([HAVE_DNSDISTDISTHTML], [test -d $srcdir/pdns/dnsdistdist/html])
+
 AC_SUBST(LIBS)
 
 AC_SUBST([AM_CPPFLAGS],
diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 389bfbb5f..22f2dc5e5 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -52,7 +52,7 @@ EXTRA_DIST = \
 
 BUILT_SOURCES = \
 	bind-dnssec.schema.sqlite3.sql.h \
-	bindparser.h htmlfiles.h 
+	bindparser.h
 
 CLEANFILES = \
 	*.gcda \
@@ -99,7 +99,6 @@ EXTRA_PROGRAMS = \
 	calidns \
 	dnsbulktest \
 	dnsdemog \
-	dnsdist \
 	dnsgram \
 	dnsreplay \
 	dnsscan \
@@ -611,7 +610,11 @@ dnstcpbench_LDADD = \
 	$(MBEDTLS_LIBS) \
 	$(BOOST_PROGRAM_OPTIONS_LIBS)
 
-dnsdist_SOURCES = \
+if HAVE_DNSDISTDISTHTML
+BUILT_SOURCES += htmlfiles.h
+EXTRA_PROGRAMS += dnsdist
+
+nodist_dnsdist_SOURCES = \
 	base32.cc \
 	base64.hh \
 	dns.cc \
@@ -652,6 +655,10 @@ dnsdist_LDADD = \
 	$(YAHTTP_LIBS) \
 	$(LIBSODIUM_LIBS)
 
+htmlfiles.h: $(srcdir)/dnsdistdist/html/*
+	$(srcdir)/dnsdistdist/incfiles $(srcdir)/dnsdistdist > $@
+endif
+
 nsec3dig_SOURCES = \
 	base32.cc \
 	base64.cc base64.hh \
@@ -1226,9 +1233,6 @@ endif
 dnslabeltext.cc: dnslabeltext.rl
 	$(AM_V_GEN)$(RAGEL) $< -o dnslabeltext.cc
 
-htmlfiles.h: $(srcdir)/dnsdistdist/html/*
-	$(srcdir)/dnsdistdist/incfiles $(srcdir)/dnsdistdist > $@
-
 bind-dnssec.schema.sqlite3.sql.h: bind-dnssec.schema.sqlite3.sql
 	( echo 'static char sqlCreate[] __attribute__((unused))=' ; sed 's/$$/"/g' $< | sed 's/^/"/g'  ; echo ';' ) > $@