From 2bb1a064eb502d2a7c312916e516533dab76cb49 Mon Sep 17 00:00:00 2001
From: octo <octo>
Date: Fri, 20 Jan 2006 17:30:19 +0000
Subject: [PATCH] Updated to version 3.6.1, due to a bug in `configure.in'

---
 ChangeLog        |  5 +++++
 collectd.spec    |  5 ++++-
 configure.in     | 12 +++++++++---
 debian/changelog |  6 ++++++
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 838d16f6..bd8bd412 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-20, Version 3.6.1
+	* Due to a bug in `configure.in' all modules and the binary were
+	  linked against `libmysqlclient'. This issue is solved by this
+	  release.
+
 2006-01-17, Version 3.6.0
 	* A config file has been added. This allows for loading only specific
 	  plugins.
diff --git a/collectd.spec b/collectd.spec
index b03991cf..ba2e1448 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,6 +1,6 @@
 Summary:	Statistics collection daemon for filling RRD files.
 Name:           collectd
-Version:	3.6.0
+Version:	3.6.1
 Release:	1
 Source:		http://verplant.org/collectd/%{name}-%{version}.tar.gz
 License:	GPL
@@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0444,root,root) %{_libdir}/%{name}/sensors.so*
 
 %changelog
+* Fri Jan 20 2006 Florian octo Forster <octo@verplant.org> 3.6.1-1
+- New upstream version
+
 * Fri Jan 20 2006 Florian octo Forster <octo@verplant.org> 3.6.0-1
 - New upstream version
 - Added config file, `collectd.conf(5)', `df.so'
diff --git a/configure.in b/configure.in
index 02f9db86..a6e830fb 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.6.0)
+AC_INIT(collectd, 3.6.1)
 AC_CONFIG_SRCDIR(src/collectd.c)
 AC_CONFIG_HEADERS(src/config.h)
 AM_INIT_AUTOMAKE(dist-bzip2)
@@ -365,11 +365,17 @@ AC_ARG_WITH(libmysql, [AS_HELP_STRING([--with-libmysql@<:@=PREFIX@:>@], [Path to
 ])
 if test "x$with_libmysql" = "xyes"
 then
-	AC_CHECK_LIB(mysqlclient, mysql_init,, [with_libmysql="no (libmysql not found)"])
+	AC_CHECK_LIB(mysqlclient, mysql_init,
+	[
+		AC_DEFINE(HAVE_LIBMYSQLCLIENT, 1, [Define to 1 if you have the mysqlclient library (-lmysqlclient).])
+	], [with_libmysql="no (libmysql not found)"])
 fi
 if test "x$with_libmysql" = "xyes"
 then
-	AC_CHECK_HEADERS(mysql/mysql.h,, [with_libmysql="no (mysql/mysql.h not found)"])
+	AC_CHECK_HEADERS(mysql/mysql.h,
+	[
+		AC_DEFINE(HAVE_MYSQL_MYSQL_H, 1, [Define to 1 if you have the <mysql/mysql.h> header file.])
+	], [with_libmysql="no (mysql/mysql.h not found)"])
 fi
 if test "x$with_libmysql" = "xyes"
 then
diff --git a/debian/changelog b/debian/changelog
index c10fbbf9..44fbd720 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+collectd (3.6.1-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Florian Forster <octo@verplant.org>  Fri, 20 Jan 2006 12:56:12 +0200
+
 collectd (3.6.0-1) unstable; urgency=low
 
   * New upstream version
-- 
2.11.0