common.[ch]: Provide a function `format_name' to turn a value-list into its string...

[collectd.git] / configure.in

diff --git a/configure.in b/configure.in
index 27a6ec4..f380ca2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1082,42 +1082,6 @@ else
 fi
 AM_CONDITIONAL(BUILD_WITH_LIBIPTC, test "x$with_libiptc" = "xyes")
 
-# Define `step' and `hearbeat' values..
-declare -i collectd_step=10
-declare -i collectd_heartbeat=25
-AC_ARG_WITH(step, [AS_HELP_STRING([--with-step=SECONDS], [Interval in which plugins are queried.])],
-[
-       if test "x$withval" != "xno" -a "x$withval" != "xyes"
-       then
-               declare -i tmp_collectd_step="$withval"
-               if test $tmp_collectd_step -gt 0
-               then
-                       collectd_step=$tmp_collectd_step
-                       let "collectd_heartbeat=$collectd_step*2"
-               fi
-       fi
-], [])
-AC_ARG_WITH(heartbeat, [AS_HELP_STRING([--with-heartbeat=SECONDS], [Heartbeat of the DS in generated RRD files.])],
-[
-       if test "x$withval" != "xno" -a "x$withval" != "xyes"
-       then
-               declare -i tmp_collectd_heartbeat="$withval"
-               if test $tmp_collectd_heartbeat -gt 0
-               then
-                       collectd_heartbeat=$tmp_collectd_heartbeat
-               fi
-       fi
-], [])
-
-if test $collectd_step -ne 10
-then
-       AC_DEFINE_UNQUOTED(COLLECTD_STEP, "$collectd_step", [Interval in which plugins are queried.])
-fi
-if test $collectd_heartbeat -ne 25
-then
-       AC_DEFINE_UNQUOTED(COLLECTD_HEARTBEAT, "$collectd_heartbeat", [Interval in which plugins are queried.])
-fi
-
 # Check for enabled/disabled features
 #
 
@@ -1248,8 +1212,6 @@ Configuration:
   Features:
     debug . . . . . . . $enable_debug
     daemon mode . . . . $enable_daemon
-    step  . . . . . . . $collectd_step seconds
-    heartbeat . . . . . $collectd_heartbeat seconds
 
   Modules:
     apache  . . . . . . $enable_apache
@@ -1270,6 +1232,7 @@ Configuration:
     iptables  . . . . . $enable_iptables
     irq . . . . . . . . $enable_irq
     load  . . . . . . . $enable_load
+    logfile . . . . . . $enable_logfile
     mbmon . . . . . . . $enable_mbmon
     memory  . . . . . . $enable_memory
     multimeter  . . . . $enable_multimeter
@@ -1281,7 +1244,6 @@ Configuration:
     processes . . . . . $enable_processes
     sensors . . . . . . $enable_sensors
     serial  . . . . . . $enable_serial
-    logfile . . . . . . $enable_logfile
     swap  . . . . . . . $enable_swap
     syslog  . . . . . . $enable_syslog
     tape  . . . . . . . $enable_tape