sensors plugin: Fix programming mistakes.

[collectd.git] / configure.in

diff --git a/configure.in b/configure.in
index 48029d0..f380ca2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -242,7 +242,7 @@ AC_CHECK_HEADERS(sys/swap.h)
 AC_CHECK_HEADERS(utmp.h)
 AC_CHECK_HEADERS(utmpx.h)
 
-# For traffic plugin
+# For interface plugin
 AC_CHECK_HEADERS(ifaddrs.h)
 AC_CHECK_HEADERS(net/if.h, [], [],
 [
@@ -331,7 +331,9 @@ AC_CHECK_HEADERS(netinet/if_ether.h)
 AC_CHECK_HEADERS(termios.h)
 AC_CHECK_HEADERS(sys/ioctl.h)
 
-dnl Checking for libraries
+#
+# Checking for libraries
+#
 AC_CHECK_LIB(m, ext)
 
 #
@@ -383,7 +385,7 @@ AC_CHECK_FUNCS(getutent getutxent)
 AC_CHECK_FUNCS(quotactl)
 AC_CHECK_FUNCS(getgrgid getpwuid)
 
-# For traffic module
+# For interface module
 AC_CHECK_FUNCS(getifaddrs)
 
 # Check for NAN
@@ -1041,41 +1043,44 @@ AC_DEFINE_UNQUOTED(COLLECT_LIBPCAP, [$collect_libpcap],
        [Wether or not to use the pcap library])
 AM_CONDITIONAL(BUILD_WITH_LIBPCAP, test "x$with_libpcap" = "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.])],
+AC_ARG_WITH(libiptc, [AS_HELP_STRING([--with-libiptc@<:@=PREFIX@:>@], [Path to libiptc.])],
 [
-       if test "x$withval" != "xno" -a "x$withval" != "xyes"
+       if test "x$withval" != "xno" && test "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
+               LDFLAGS="$LDFLAGS -L$withval/lib"
+               CPPFLAGS="$CPPFLAGS -I$withval/include"
+               with_libiptc="yes"
        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"
+       if test "x$ac_system" = "xLinux"
        then
-               declare -i tmp_collectd_heartbeat="$withval"
-               if test $tmp_collectd_heartbeat -gt 0
-               then
-                       collectd_heartbeat=$tmp_collectd_heartbeat
-               fi
+               with_libiptc="yes"
+       else
+               with_libiptc="no (Linux only)"
        fi
-], [])
-
-if test $collectd_step -ne 10
+])
+if test "x$with_libiptc" = "xyes"
 then
-       AC_DEFINE_UNQUOTED(COLLECTD_STEP, "$collectd_step", [Interval in which plugins are queried.])
+       AC_CHECK_LIB(iptc, iptc_init,
+       [
+               AC_DEFINE(HAVE_LIBIPTC, 1, [Define to 1 if you have the iptc library (-liptc).])
+       ], [with_libiptc="no (libiptc not found)"])
 fi
-if test $collectd_heartbeat -ne 25
+if test "x$with_libiptc" = "xyes"
 then
-       AC_DEFINE_UNQUOTED(COLLECTD_HEARTBEAT, "$collectd_heartbeat", [Interval in which plugins are queried.])
+       AC_CHECK_HEADERS(libiptc/libiptc.h,
+       [
+               AC_DEFINE(HAVE_LIBIPTC_LIBIPTC_H, 1, [Define to 1 if you have the <libiptc/libiptc.h> header file.])
+       ], [with_libiptc="no (libiptc/libiptc.h not found)"])
+fi
+if test "x$with_libiptc" = "xyes"
+then
+       collect_libiptc=1
+else
+       collect_libiptc=0
 fi
+AM_CONDITIONAL(BUILD_WITH_LIBIPTC, test "x$with_libiptc" = "xyes")
 
 # Check for enabled/disabled features
 #
@@ -1162,6 +1167,8 @@ AC_COLLECTD([email],     [disable], [module], [email statistics])
 AC_COLLECTD([entropy],   [disable], [module], [entropy statistics])
 AC_COLLECTD([exec],      [disable], [module], [exec of external programs])
 AC_COLLECTD([hddtemp],   [disable], [module], [hdd temperature statistics])
+AC_COLLECTD([interface], [disable], [module], [interface statistics])
+AC_COLLECTD([iptables],  [disable], [module], [IPtables statistics])
 AC_COLLECTD([irq],       [disable], [module], [irq statistics])
 AC_COLLECTD([load],      [disable], [module], [system load statistics])
 AC_COLLECTD([mbmon],     [disable], [module], [motherboard monitor statistics])
@@ -1175,9 +1182,10 @@ AC_COLLECTD([ping],      [disable], [module], [ping statistics])
 AC_COLLECTD([processes], [disable], [module], [processes statistics])
 AC_COLLECTD([sensors],   [disable], [module], [lm_sensors statistics])
 AC_COLLECTD([serial],    [disable], [module], [serial statistics])
+AC_COLLECTD([logfile],   [disable], [module], [logfile log facility])
 AC_COLLECTD([swap],      [disable], [module], [swap statistics])
+AC_COLLECTD([syslog],    [disable], [module], [syslog log facility])
 AC_COLLECTD([tape],      [disable], [module], [tape statistics])
-AC_COLLECTD([traffic],   [disable], [module], [system traffic statistics])
 AC_COLLECTD([unixsock],  [disable], [module], [UNIX socket plugin])
 AC_COLLECTD([users],     [disable], [module], [user count statistics])
 AC_COLLECTD([vserver],   [disable], [module], [vserver statistics])
@@ -1198,13 +1206,12 @@ Configuration:
     libkstat  . . . . . $with_kstat
     libmysql  . . . . . $with_libmysql
     libpcap . . . . . . $with_libpcap
+    libiptc . . . . . . $with_libiptc
     libpthread  . . . . $with_libpthread
 
   Features:
     debug . . . . . . . $enable_debug
     daemon mode . . . . $enable_daemon
-    step  . . . . . . . $collectd_step seconds
-    heartbeat . . . . . $collectd_heartbeat seconds
 
   Modules:
     apache  . . . . . . $enable_apache
@@ -1221,8 +1228,11 @@ Configuration:
     entropy . . . . . . $enable_entropy
     exec  . . . . . . . $enable_exec
     hddtemp . . . . . . $enable_hddtemp
+    interface . . . . . $enable_interface
+    iptables  . . . . . $enable_iptables
     irq . . . . . . . . $enable_irq
     load  . . . . . . . $enable_load
+    logfile . . . . . . $enable_logfile
     mbmon . . . . . . . $enable_mbmon
     memory  . . . . . . $enable_memory
     multimeter  . . . . $enable_multimeter
@@ -1235,8 +1245,8 @@ Configuration:
     sensors . . . . . . $enable_sensors
     serial  . . . . . . $enable_serial
     swap  . . . . . . . $enable_swap
+    syslog  . . . . . . $enable_syslog
     tape  . . . . . . . $enable_tape
-    traffic . . . . . . $enable_traffic
     unixsock  . . . . . $enable_unixsock
     users . . . . . . . $enable_users
     vserver . . . . . . $enable_vserver