From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 31 Mar 2007 06:12:22 +0000 (+0200)
Subject: Merge branch 'master' into collectd-4
X-Git-Tag: collectd-4.0.0~116
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=dc80c73c20ef0e69c3850fd9679a827ad79e61a1;hp=0352eb93e70fb471d4975823db38147d2661f4bf;p=collectd.git

Merge branch 'master' into collectd-4

Conflicts:

	src/iptables.c
---

diff --git a/ChangeLog b/ChangeLog
index 66c1fc1d..5fac3d65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 	* apache plugin: Support for lighttpd's `BusyServers' (aka.
 	connections) field was added by Florent Monbillard.
 
+2007-03-30, Version 3.11.3
+	* configure: Have the configure-script define `HAVE_LIBKSTAT' instead
+	  of the unused `COLLECT_KSTAT'.
+
 2007-02-11, Version 3.11.2
 	* plugin: Catch NULL-pointer and try to fix them. Otherwise the
 	  NULL-pointer may have been passed to `printf' which causes a
diff --git a/configure.in b/configure.in
index 20b5d1c6..3e85bffe 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(collectd, 3.11.2)
+AC_INIT(collectd, 3.11.3)
 AC_CONFIG_SRCDIR(src/collectd.c)
 AC_CONFIG_HEADERS(src/config.h)
 AM_INIT_AUTOMAKE(dist-bzip2)
@@ -734,12 +734,9 @@ then
 fi
 if test "x$with_kstat" = "xyes"
 then
-	collect_kstat=1
-else
-	collect_kstat=0
+	AC_DEFINE(HAVE_LIBKSTAT, 1,
+		  [Define to 1 if you have the 'kstat' library (-lkstat)])
 fi
-AC_DEFINE_UNQUOTED(COLLECT_KSTAT, [$collect_kstat],
-	[Wether or not to use kstat library (Solaris)])
 AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes")
 AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")
 
diff --git a/debian/changelog b/debian/changelog
index 7fe14f05..fead6727 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+collectd (3.11.3-0octo1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Florian octo Forster <octo@alice.lan.home.verplant.org>  Fri, 30 Mar 2007 22:08:40 +0200
+
 collectd (3.11.0-0octo1) unstable; urgency=low
 
   * New upstream release.