Enable protobuf support in recursor packages

diff --git a/build-scripts/build-recursor-rpm b/build-scripts/build-recursor-rpm
index 1f99a6b2c476d9ca32424099755de284372480d0..fbc37cc51b4e4539b219fb32ca060acb559c0a9f 100755 (executable)
--- a/build-scripts/build-recursor-rpm
+++ b/build-scripts/build-recursor-rpm
@@ -122,6 +122,8 @@ Source1: pdns-recursor.init
 Provides: powerdns-recursor = %{version}-%{release}
 BuildRequires: boost-devel
 BuildRequires: lua-devel
+BuildRequires: protobuf-devel
+BuildRequires: protobuf-compiler
 
 Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
@@ -142,7 +144,7 @@ package if you need a dns cache for your network.
        --disable-static \
        --disable-dependency-tracking \
        --disable-silent-rules \
-       --without-protobuf \
+       --with-protobuf \
        --enable-unit-tests
 
 make %{?_smp_mflags}
@@ -212,6 +214,8 @@ BuildRequires: lua-devel
 BuildRequires: systemd-units
 BuildRequires: systemd-devel
 BuildRequires: hostname
+BuildRequires: protobuf-devel
+BuildRequires: protobuf-compiler
 
 Requires(pre): shadow-utils
 Requires(post): systemd-sysv
@@ -234,7 +238,7 @@ package if you need a dns cache for your network.
        --disable-dependency-tracking \
        --disable-silent-rules \
        --enable-unit-tests \
-       --without-protobuf \
+       --with-protobuf \
        --enable-systemd
 
 make %{?_smp_mflags}

diff --git a/build-scripts/debian-recursor/control.in b/build-scripts/debian-recursor/control.in
index 583760e69c096d54a1ce137f970c07232598695b..a7e2b4e443d0929835631df6d9575c7aeaeb25aa 100644 (file)
--- a/build-scripts/debian-recursor/control.in
+++ b/build-scripts/debian-recursor/control.in
@@ -4,7 +4,7 @@ Priority: extra
 Standards-Version: 3.9.6
 Maintainer: PowerDNS Autobuilder <powerdns.support@powerdns.com>
 Origin: PowerDNS
-Build-Depends: debhelper (>= 9~), dh-systemd, quilt, dpkg-dev (>= 1.17.0~), libboost-dev, libboost-serialization-dev, liblua5.2-dev, pkg-config @LIBSYSTEMDDEV@
+Build-Depends: debhelper (>= 9~), dh-systemd, quilt, dpkg-dev (>= 1.17.0~), libboost-dev, libboost-serialization-dev, liblua5.2-dev, libprotobuf-dev, protobuf-compiler, pkg-config @LIBSYSTEMDDEV@
 Homepage: http://www.powerdns.com/
 
 Package: pdns-recursor

diff --git a/build-scripts/debian-recursor/rules b/build-scripts/debian-recursor/rules
index a82f4290b960e35bfad0a11425a84378b0394d08..5df0e852768910cd166a87d2c3c067d80a03b8c0 100755 (executable)
--- a/build-scripts/debian-recursor/rules
+++ b/build-scripts/debian-recursor/rules
@@ -46,7 +46,7 @@ override_dh_auto_configure:
                --libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)' \
                --libexecdir='$${prefix}/lib' \
                --enable-unit-tests \
-               --without-protobuf \
+               --with-protobuf=yes \
                $(ENABLE_SYSTEMD)
 
 override_dh_auto_install: