From 02cab14affd9d0d3b4fd4f041d9a721d2ad6d6e2 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 24 May 2016 12:47:43 +0200
Subject: [PATCH] Disable protobuf detection in packages

So that we do not accidently link against it.
---
 build-scripts/build-auth-rpm             | 3 +++
 build-scripts/build-dnsdist-rpm          | 1 +
 build-scripts/build-recursor-rpm         | 2 ++
 build-scripts/debian-authoritative/rules | 1 +
 build-scripts/debian-dnsdist/rules       | 1 +
 build-scripts/debian-recursor/rules      | 1 +
 6 files changed, 9 insertions(+)

diff --git a/build-scripts/build-auth-rpm b/build-scripts/build-auth-rpm
index c8b73998af..cc79459be5 100755
--- a/build-scripts/build-auth-rpm
+++ b/build-scripts/build-auth-rpm
@@ -171,6 +171,7 @@ export CPPFLAGS="-DLDAP_DEPRECATED"
 	--with-lua \
 	--with-dynmodules='%{backends} random' \
 	--enable-tools \
+	--without-protobuf \
 	--enable-remotebackend-http \
 	--enable-unit-tests
 
@@ -438,6 +439,7 @@ export CPPFLAGS="-DLDAP_DEPRECATED"
 	--with-lua \
 	--with-dynmodules='%{backends} random' \
 	--enable-tools \
+	--without-protobuf \
 	--enable-unit-tests \
 	--enable-systemd
 
@@ -693,6 +695,7 @@ export CPPFLAGS="-DLDAP_DEPRECATED"
 	--with-lua \
 	--with-dynmodules='%{backends} random' \
 	--enable-tools \
+	--without-protobuf \
 	--enable-unit-tests \
 	--enable-systemd
 
diff --git a/build-scripts/build-dnsdist-rpm b/build-scripts/build-dnsdist-rpm
index 71b87577bc..9f0e0dd8d4 100755
--- a/build-scripts/build-dnsdist-rpm
+++ b/build-scripts/build-dnsdist-rpm
@@ -104,6 +104,7 @@ ${SETUP}
 %build
 %configure \
   --sysconfdir=/etc/dnsdist \
+  --without-protobuf \
   ${INIT_CONFIGURE}
   ${SODIUM_CONFIGURE}
 
diff --git a/build-scripts/build-recursor-rpm b/build-scripts/build-recursor-rpm
index 1c5882d65f..1f99a6b2c4 100755
--- a/build-scripts/build-recursor-rpm
+++ b/build-scripts/build-recursor-rpm
@@ -142,6 +142,7 @@ package if you need a dns cache for your network.
 	--disable-static \
 	--disable-dependency-tracking \
 	--disable-silent-rules \
+	--without-protobuf \
 	--enable-unit-tests
 
 make %{?_smp_mflags}
@@ -233,6 +234,7 @@ package if you need a dns cache for your network.
 	--disable-dependency-tracking \
 	--disable-silent-rules \
 	--enable-unit-tests \
+	--without-protobuf \
 	--enable-systemd
 
 make %{?_smp_mflags}
diff --git a/build-scripts/debian-authoritative/rules b/build-scripts/debian-authoritative/rules
index 808ed45a3a..42348d2b45 100755
--- a/build-scripts/debian-authoritative/rules
+++ b/build-scripts/debian-authoritative/rules
@@ -49,6 +49,7 @@ override_dh_auto_configure:
 		--with-pgsql-includes=`pg_config --includedir` \
 		--enable-botan1.10 \
 		--enable-tools \
+		--without-protobuf \
 		--enable-unit-tests \
 		$(ENABLE_SYSTEMD)
 
diff --git a/build-scripts/debian-dnsdist/rules b/build-scripts/debian-dnsdist/rules
index 7bfaa48207..f0fafa0792 100755
--- a/build-scripts/debian-dnsdist/rules
+++ b/build-scripts/debian-dnsdist/rules
@@ -46,6 +46,7 @@ override_dh_auto_configure:
 	  --infodir=\$${prefix}/share/info \
 	  --libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)' \
 	  --libexecdir='$${prefix}/lib' \
+	  --without-protobuf \
 	  $(ENABLE_SYSTEMD) \
 	  $(ENABLE_LIBSODIUM)
 
diff --git a/build-scripts/debian-recursor/rules b/build-scripts/debian-recursor/rules
index 7e16cff734..a82f4290b9 100755
--- a/build-scripts/debian-recursor/rules
+++ b/build-scripts/debian-recursor/rules
@@ -46,6 +46,7 @@ override_dh_auto_configure:
 		--libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)' \
 		--libexecdir='$${prefix}/lib' \
 		--enable-unit-tests \
+		--without-protobuf \
 		$(ENABLE_SYSTEMD)
 
 override_dh_auto_install:
-- 
2.47.2