X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.in;h=1a97afa3a31906c1b254356f03ef3b280c0cbcc3;hb=2e58a8e03812e440f654199bb46c7838214888db;hp=1ae7ec2a648c64646206e0b1c1968a8874f5bb42;hpb=adb9c9339f6689f9d29e6d931812f7c99da52ad3;p=collectd.git

diff --git a/configure.in b/configure.in
index 1ae7ec2a..1a97afa3 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.alpha1)
+AC_INIT(collectd, 3.7.alpha1)
 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
@@ -452,6 +458,7 @@ AC_COLLECTD([daemon],    [disable], [feature], [daemon mode])
 
 m4_divert_once([HELP_ENABLE], [
 collectd modules:])
+AC_COLLECTD([battery],   [disable], [module], [battery statistics])
 AC_COLLECTD([cpu],       [disable], [module], [cpu usage statistics])
 AC_COLLECTD([cpufreq],   [disable], [module], [system cpu frequency statistics])
 AC_COLLECTD([disk],      [disable], [module], [disk/partition statistics])
@@ -704,6 +711,7 @@ Configuration:
     daemon mode . . . . $enable_daemon
 
   Modules:
+    battery . . . . . . $enable_battery
     cpu . . . . . . . . $enable_cpu
     cpufreq . . . . . . $enable_cpufreq
     df  . . . . . . . . $enable_df