ixfrdist: have a configure flag to enable

diff --git a/build-scripts/build-auth-rpm b/build-scripts/build-auth-rpm
index 5c4edb72f622a67da5e816c9bdeb6d72b6b50292..6d383a623ace54679b1f2f004ba8170f7901185f 100755 (executable)
--- a/build-scripts/build-auth-rpm
+++ b/build-scripts/build-auth-rpm
@@ -457,7 +457,6 @@ fi
 %{_bindir}/dnsscope
 %{_bindir}/dnswasher
 %{_bindir}/dumresp
-%{_bindir}/ixfrdist
 %{_bindir}/ixplore
 %{_bindir}/pdns_notify
 %{_bindir}/nproxy
@@ -472,8 +471,6 @@ fi
 %{_mandir}/man1/dnsscope.1.gz
 %{_mandir}/man1/dnswasher.1.gz
 %{_mandir}/man1/dumresp.1.gz
-%{_mandir}/man1/ixfrdist.1.gz
-%{_mandir}/man5/ixfrdist.yml.5.gz
 %{_mandir}/man1/ixplore.1.gz
 %{_mandir}/man1/pdns_notify.1.gz
 %{_mandir}/man1/nproxy.1.gz
@@ -704,6 +701,7 @@ export CPPFLAGS="-DLDAP_DEPRECATED"
        --with-lua=luajit \
        --with-dynmodules='%{backends} random' \
        --enable-tools \
+       --enable-ixfrdist \
        --enable-libsodium \
        --enable-unit-tests \
        --enable-experimental-pkcs11 \
@@ -992,6 +990,7 @@ export CPPFLAGS="-DLDAP_DEPRECATED"
        --with-lua \
        --with-dynmodules='%{backends} random' \
        --enable-tools \
+       --enable-ixfrdist \
        --without-protobuf \
        --enable-unit-tests \
        --enable-systemd \

diff --git a/build-scripts/debian-authoritative/control.in b/build-scripts/debian-authoritative/control.in
index 06a37c05be5ac9e47817e1c1e16fd90e8f12ba45..9278dc9f0eb03269ce6dc992c307b7b3cb4dc5b5 100644 (file)
--- a/build-scripts/debian-authoritative/control.in
+++ b/build-scripts/debian-authoritative/control.in
@@ -4,7 +4,7 @@ Priority: extra
 Standards-Version: 3.9.8
 Maintainer: PowerDNS Autobuilder <powerdns.support@powerdns.com>
 Origin: PowerDNS
-Build-Depends: debhelper (>= 9~), dh-autoreconf, dh-systemd, po-debconf, curl, libtool, flex, bison, libmysqlclient-dev, libpq-dev, libssl-dev, libgdbm-dev, libldap2-dev, libsqlite3-dev, dpkg-dev (>= 1.17.0~), libboost-dev, libboost-serialization-dev, libboost-program-options-dev, libboost-test-dev, autotools-dev, automake, autoconf, libluajit5.1-dev, pkg-config, ragel, libgmp-dev, libcurl4-openssl-dev, libzmq-dev, libyaml-cpp-dev (>= 0.5), libgeoip-dev, libmaxminddb-dev, libopendbx1-dev, libcdb-dev, unixodbc-dev (>= 2.3.1), libprotobuf-dev, protobuf-compiler, libp11-kit-dev @LIBSYSTEMDDEV@ @LIBSODIUMDEV@
+Build-Depends: debhelper (>= 9~), dh-autoreconf, dh-systemd, po-debconf, curl, libtool, flex, bison, libmysqlclient-dev, libpq-dev, libssl-dev, libgdbm-dev, libldap2-dev, libsqlite3-dev, dpkg-dev (>= 1.17.0~), libboost-dev, libboost-serialization-dev, libboost-program-options-dev, libboost-test-dev, autotools-dev, automake, autoconf, libluajit5.1-dev, pkg-config, ragel, libgmp-dev, libcurl4-openssl-dev, libzmq-dev, libyaml-cpp-dev (>= 0.5), libgeoip-dev, libmaxminddb-dev, libopendbx1-dev, libcdb-dev, unixodbc-dev (>= 2.3.1), libprotobuf-dev, protobuf-compiler, libp11-kit-dev, libyaml-cpp-dev, @LIBSYSTEMDDEV@ @LIBSODIUMDEV@
 Homepage: http://www.powerdns.com/
 
 Package: pdns-server

diff --git a/build-scripts/debian-authoritative/rules b/build-scripts/debian-authoritative/rules
index 784721f9d8f5b6b5fc185bd87a4b7b015da367e8..6b27c974e2a243f5812be221920b04f2d1fe8860 100755 (executable)
--- a/build-scripts/debian-authoritative/rules
+++ b/build-scripts/debian-authoritative/rules
@@ -51,6 +51,7 @@ override_dh_auto_configure:
                --with-dynmodules="$(backends)" \
                --with-modules="" \
                --enable-tools \
+               --enable-ixfrdist \
                --enable-unit-tests \
                --with-lua=luajit \
                --enable-experimental-pkcs11 \

diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh
index 9c4be9765fc355ae12fc7be52e7907a24f0ef1a3..bdaf1060ae32df498f3150601ef29616df0bd728 100755 (executable)
--- a/build-scripts/travis.sh
+++ b/build-scripts/travis.sh
@@ -384,6 +384,7 @@ build_auth() {
     --enable-experimental-pkcs11 \
     --enable-remotebackend-zeromq \
     --enable-tools \
+    --enable-ixfrdist \
     --enable-unit-tests \
     --enable-backend-unit-tests \
     --disable-dependency-tracking \

diff --git a/configure.ac b/configure.ac
index 0f14fbe3aa10e384f4927d6ef2849117e2108fb2..7984a4c153942340426025f7b6323204dd448206 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -224,11 +224,7 @@ AC_ARG_ENABLE([tools],
 
 AC_MSG_RESULT([$enable_tools])
 AM_CONDITIONAL([TOOLS], [test "x$enable_tools" != "xno"])
-AS_IF([test "x$enable_tools" != "xno"], [
-  PKG_CHECK_MODULES([YAML], [yaml-cpp >= 0.5],[],
-    AC_MSG_ERROR([Could not find yaml-cpp])
-  )]
-)
+PDNS_ENABLE_IXFRDIST
 
 PDNS_WITH_PROTOBUF
 

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 1622f1d7208f7c0fb5312ffdfa0a858103fec93d..af10ac730d5f67415f6ddd2fc27509eb2b7d8ee0 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -20,8 +20,6 @@ MANPAGES_TARGET_TOOLS = calidns.1 \
        dnsscope.1 \
        dnswasher.1 \
        dumresp.1 \
-       ixfrdist.1 \
-       ixfrdist.yml.5 \
        ixplore.1 \
        nproxy.1 \
        nsec3dig.1 \
@@ -29,7 +27,11 @@ MANPAGES_TARGET_TOOLS = calidns.1 \
        saxfr.1 \
        sdig.1
 
+MANPAGES_TARGET_IXFRDIST = ixfrdist.1 \
+       ixfrdist.yml.5
+
 MANPAGES_DIST += $(MANPAGES_TARGET_TOOLS) \
+       $(MANPAGES_TARGET_IXFRDIST) \
        dnsbulktest.1 \
        dnstcpbench.1 \
        dnspcap2protobuf.1
@@ -49,6 +51,10 @@ if TOOLS
 MANPAGES_INSTALL += $(MANPAGES_TARGET_TOOLS)
 endif
 
+if IXFRDIST
+MANPAGES_INSTALL += $(MANPAGES_TARGET_IXFRDIST)
+endif
+
 man_MANS = $(MANPAGES_INSTALL)
 
 EXTRA_DIST = $(MANPAGES_DIST)

diff --git a/m4/pdns_enable_ixfrdist.m4 b/m4/pdns_enable_ixfrdist.m4
new file mode 100644 (file)
index 0000000..8113a6f
--- /dev/null
+++ b/m4/pdns_enable_ixfrdist.m4
@@ -0,0 +1,18 @@
+AC_DEFUN([PDNS_ENABLE_IXFRDIST], [
+  AC_MSG_CHECKING([whether we will be building ixfrdist])
+  AC_ARG_ENABLE([ixfrdist], [
+    AS_HELP_STRING([--enable-ixfrdist], [if we should build and install ixfrdist @<:@default=no@:>@])
+  ], [
+    enable_ixfrdist=$enableval
+  ], [
+    enable_ixfrdist=no
+  ])
+
+  AC_MSG_RESULT([$enable_ixfrdist])
+  AM_CONDITIONAL([IXFRDIST], [test "x$enable_ixfrdist" != "xno"])
+  AS_IF([test "x$enable_ixfrdist" != "xno"], [
+    PKG_CHECK_MODULES([YAML], [yaml-cpp >= 0.5], [ : ], [
+      AC_MSG_ERROR([Could not find yaml-cpp >= 0.5, required for ixfrdist])
+    ])
+  ])
+])

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index e3617525f7231611a4cbd8ad16d9188a1db4a39e..48ac1532e46bfc16438e0f5b1d279e27c3c4006f 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -101,7 +101,6 @@ bin_PROGRAMS += \
        saxfr \
        stubquery \
        ixplore \
-       ixfrdist \
        sdig
 
 if HAVE_RECVMMSG
@@ -114,6 +113,11 @@ bin_PROGRAMS += \
        dnstcpbench
 endif
 
+endif # TOOLS
+
+if IXFRDIST
+bin_PROGRAMS += \
+       ixfrdist
 endif
 
 EXTRA_PROGRAMS = \
@@ -1419,13 +1423,13 @@ CLEANFILES += \
        pdns.service \
        pdns@.service
 
-if TOOLS
+if IXFRDIST
 ixfrdist.service: ixfrdist.service.in
        $(AM_V_GEN)sed -e 's![@]bindir[@]!$(bindir)!' < $< > $@
 
 systemdsystemunit_DATA += \
        ixfrdist.service
-endif # TOOLS
+endif # IXFRDIST
 
 CLEANFILES += \
        ixfrdist.service