diff --git a/debian/rules b/debian/rules
index 8e186fca503f58161e68ce7b29f782fb6c85366e..64c66adf6ae8b8ca3a65c7d43bedcc7e7d83628c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
ifeq (,$(JAVA_ARCHDIR))
JAVA_ARCHDIR = $(DEB_BUILD_ARCH)
endif
-JAVA_HOME = /usr/lib/jvm/java-6-openjdk-$(DEB_BUILD_ARCH)
+JAVA_HOME = /usr/lib/jvm/default-java
JAVA_LIBDIR = $(JAVA_HOME)/jre/lib/$(JAVA_ARCHDIR)/server
JAVAC = $(JAVA_HOME)/bin/javac
# Solaris only (requires devinfo and kstat)
confflags += --disable-tape
+# libaquaero5 is required for the aquaero plugin
+confflags += --disable-aquaero
+
+# libmic is required for the mic plugin
+confflags += --disable-mic
+
# libnetapp is required for the netapp plugin.
confflags += --disable-netapp
# librouteros is required for the routeros plugin.
confflags += --disable-routeros
+# libsigrok >= 0.2.0 is required for the sigrok plugin, should arrive in unstable soon
+confflags += --disable-sigrok
+
# libmongoc is required for the write_mongodb plugin.
confflags += --disable-write_mongodb
# libkstat is required for the xfs_arc plugin.
confflags += --disable-zfs-arc
-# The static library netstat cannot be linked into shared objects on some
-# architectures (see bugs #358637, #419684 and #524593 for more details).
-ifneq (,$(filter alpha amd64 hppa ia64 ppc64 mips mipsel, $(DEB_BUILD_ARCH)))
- confflags += --disable-netlink
-endif
-
# These plugins are Linux-specific.
ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
confflags += \
+ --disable-cgroups \
--disable-ethstat \
--disable-iptables \
--disable-ipvs \
--disable-vserver
endif
+# This plugin is FreeBSD-specific.
+ifeq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
+ confflags += \
+ --disable-pf
+endif
+
# These plugins have not been ported to FreeBSD yet.
ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
# Work-around an incomplete check for kvm functionality
contrib/snmp-data.conf contrib/add_rra.sh contrib/network-proxy.py \
contrib/collectd_network.py contrib/collectd_unixsock.py \
contrib/snmp-probe-host.px contrib/GenericJMX.conf \
+ contrib/postgresql \
debian/collectd.conf debian/filters.conf debian/thresholds.conf
# some upstream tarballs have been built inside a dirty working dir
( cd debian/collectd-core/ \