X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.in;h=db2fdb5e3c4f324e19a37c910e777bbce0dbe06c;hb=257828f628523077c73c858744e1e93f0231304a;hp=4d8023e6a8d7ffcc1dc7d7c24a05d64f6bf81010;hpb=6e765a0287381977bd90efa8a46c0f1d1aecd1e5;p=collectd.git

diff --git a/configure.in b/configure.in
index 4d8023e6..db2fdb5e 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.5.alpha1-quota)
+AC_INIT(collectd, 3.5.0)
 AC_CONFIG_SRCDIR(src/collectd.c)
 AC_CONFIG_HEADERS(src/config.h)
 AM_INIT_AUTOMAKE(dist-bzip2)
@@ -312,6 +312,8 @@ fi
 #
 # Check for enabled/disabled features
 #
+m4_divert_once([HELP_ENABLE], [
+collectd features:])
 AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],
 	[Enable debugging (disabled by default)]),
 	[], [enable_debug="no"])
@@ -352,6 +354,8 @@ AC_DEFINE_UNQUOTED(COLLECT_DAEMON, [$collect_daemon],
 	[Wether or not to enable daemon mode])
 AM_CONDITIONAL(BUILD_DAEMON, test "x$enable_daemon" = "xyes")
 
+m4_divert_once([HELP_ENABLE], [
+collectd modules:])
 AC_ARG_ENABLE(cpu, AC_HELP_STRING([--disable-cpu], [Disable CPU usage statistics]),, [enable_cpu="yes"])
 if test "x$enable_cpu" != "xno"
 then
@@ -400,26 +404,6 @@ then
 fi
 AM_CONDITIONAL(BUILD_MODULE_DISK, test "x$enable_disk" = "xyes")
 
-AC_ARG_ENABLE(quota, AC_HELP_STRING([--enable-quota],
-	[Enable quota statistics (experimental, disabled by default)]),
-	[], [enable_quota="no"])
-if test "x$enable_quota" = "xno"
-then
-	collect_quota=0
-else
-	if test "x$enable_quota" = "xyes"
-	then
-		collect_quota=1
-	else
-		AC_MSG_NOTICE([Please specify either --enable-quota or --disable-quota; Enabling quota statistics.])
-		collect_quota=1
-		enable_quota="yes"
-	fi
-fi
-AC_DEFINE_UNQUOTED(COLLECT_QUOTA, [$collect_quota],
-	[Wether or not to collect quota statistics])
-AM_CONDITIONAL(BUILD_MODULE_QUOTA, test "x$enable_quota" = "xyes")
-
 AC_ARG_ENABLE(hddtemp, AC_HELP_STRING([--disable-hddtemp], [Disable hdd temperature statistics]),, [enable_hddtemp="yes"])
 if test "x$enable_hddtemp" = "xno"
 then
@@ -502,6 +486,26 @@ then
 fi
 AM_CONDITIONAL(BUILD_MODULE_PROCESSES, test "x$enable_processes" = "xyes")
 
+#AC_ARG_ENABLE(quota, AC_HELP_STRING([--enable-quota],
+#	[Enable quota statistics (experimental, disabled by default)]),
+#	[], [enable_quota="no"])
+#if test "x$enable_quota" = "xno"
+#then
+#	collect_quota=0
+#else
+#	if test "x$enable_quota" = "xyes"
+#	then
+#		collect_quota=1
+#	else
+#		AC_MSG_NOTICE([Please specify either --enable-quota or --disable-quota; Enabling quota statistics.])
+#		collect_quota=1
+#		enable_quota="yes"
+#	fi
+#fi
+#AC_DEFINE_UNQUOTED(COLLECT_QUOTA, [$collect_quota],
+#	[Wether or not to collect quota statistics])
+#AM_CONDITIONAL(BUILD_MODULE_QUOTA, test "x$enable_quota" = "xyes")
+
 AC_ARG_ENABLE(sensors, AC_HELP_STRING([--disable-sensors], [Disable lm_sensors statistics]),, [enable_sensors=$with_lm_sensors])
 if test "x$enable_sensors" != "xno"
 then
@@ -617,7 +621,6 @@ Configuration:
     cpu . . . . . . . . $enable_cpu
     cpufreq . . . . . . $enable_cpufreq
     disk  . . . . . . . $enable_disk
-    quota . . . . . . . $enable_quota (experimental)
     hddtemp . . . . . . $enable_hddtemp
     load  . . . . . . . $enable_load
     memory  . . . . . . $enable_memory