From: Sebastian Harl <sh@tokkee.org>
Date: Thu, 17 May 2012 14:16:15 +0000 (+0200)
Subject: rules: Don't force building of the ipvs plugin.
X-Git-Tag: collectd-4.10.7-1~19
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d5eff71d0a1779525400365edf010a1208b5576c;p=pkg-collectd.git

rules: Don't force building of the ipvs plugin.

The ip_vs.h check has been fixed in configure.
---

diff --git a/debian/changelog b/debian/changelog
index 3ca252c..8241058 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ collectd (4.10.7-1) unstable; urgency=low
     - Use dpkg-buildflags to determine compiler/linker flags; this also
       enables hardening build flags; thanks to Moritz Muehlenhoff for
       providing the patch (Closes: #656271).
+    - Don't force building of the ipvs plugin. The ip_vs.h check has been
+      fixed in configure.
   * debian/README.Debian:
     - Added section 'Cleanup of old data' explaining how to get rid of
       out-dated data files (e.g. RRD files).
diff --git a/debian/rules b/debian/rules
index b506e2d..5f4eb6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -96,11 +96,6 @@ ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
 		--disable-netlink \
 		--disable-sensors \
 		--disable-vserver
-else
-	# configure is not currently able to correctly check for ip_vs.h.
-	# ipvs_h_include.dpatch takes care of using the right one. Overwriting
-	# KERNEL_DIR makes sure we don't use any kernel headers directly.
-	confflags += --enable-ipvs=force KERNEL_DIR=/usr
 endif
 
 # These plugins have not been ported to FreeBSD yet.