author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Sat, 31 Mar 2007 06:09:50 +0000 (08:09 +0200) | ||
committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Sat, 31 Mar 2007 06:09:50 +0000 (08:09 +0200) |
Conflicts:
ChangeLog
ChangeLog
ChangeLog | patch | blob | history | |
configure.in | patch | blob | history | |
debian/changelog | patch | blob | history |
diff --git a/ChangeLog b/ChangeLog
index 66c1fc1dcb6ddc732a79bfcf196a5eeb606c288f..5fac3d655d70b510d96c5da39e646315cbe4f010 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
* 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 7251383bd8f9916a9f8c8f393b1079bb40403304..4f8bb09893d02dc2b2cdcd7a9bcb54541fde781d 100644 (file)
--- a/configure.in
+++ b/configure.in
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)
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 7fe14f055f4c2481d7b4d4dbc8f166ccb0cf5cee..fead67273594b0bf5a9826f8bca9f6fc77c86258 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
+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.