Merge branch 'master' into collectd-4

Conflicts:

	configure.in

diff --cc configure.in
index 39c7e98bca68115562512f41cb29c295fe770059,7251383bd8f9916a9f8c8f393b1079bb40403304..ff12f6819fb7de627c842dc83f0848a427bedf97
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -327,11 -309,9 +327,13 @@@ AC_CHECK_HEADERS(net/if_arp.h
  AC_CHECK_HEADERS(net/if_ppp.h)
  AC_CHECK_HEADERS(netinet/if_ether.h)
  
- dnl Checking for libraries
 +# For the multimeter plugin
 +AC_CHECK_HEADERS(termios.h)
 +AC_CHECK_HEADERS(sys/ioctl.h)
 +
+ #
+ # Checking for libraries
+ #
  AC_CHECK_LIB(m, ext)
  
  #
@@@ -1159,9 -1085,9 +1200,10 @@@ AC_COLLECTD([csv],       [disable], [mo
  AC_COLLECTD([df],        [disable], [module], [df statistics])
  AC_COLLECTD([dns],       [disable], [module], [dns statistics])
  AC_COLLECTD([email],     [disable], [module], [email statistics])
 -AC_COLLECTD([quota],     [enable],  [module], [quota statistics (experimental)])
 +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([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])
@@@ -1219,10 -1142,9 +1262,11 @@@ Configuration
      disk  . . . . . . . $enable_disk
      dns . . . . . . . . $enable_dns
      email . . . . . . . $enable_email
 +    entropy . . . . . . $enable_entropy
 +    exec  . . . . . . . $enable_exec
      hddtemp . . . . . . $enable_hddtemp
      irq . . . . . . . . $enable_irq
+     iptables  . . . . . $enable_iptables
      load  . . . . . . . $enable_load
      mbmon . . . . . . . $enable_mbmon
      memory  . . . . . . $enable_memory

diff --cc src/Makefile.am
Simple merge

diff --cc src/collectd.conf.in
index 69b596213c7e25e55f0c911ed720d1925bea3396,b3f99637de2c972da6b9792976851b5527cef90e..d9594934061781f94b720996c69665e66d90616b
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -24,8 -29,8 +24,9 @@@
  @BUILD_MODULE_DF_TRUE@LoadPlugin df
  @BUILD_MODULE_DISK_TRUE@LoadPlugin disk
  @BUILD_MODULE_DNS_TRUE@LoadPlugin dns
 +@BUILD_MODULE_EMAIL_TRUE@LoadPlugin email
  @BUILD_MODULE_HDDTEMP_TRUE@LoadPlugin hddtemp
+ @BUILD_MODULE_IPTABLES_TRUE@LoadPlugin iptables
  @BUILD_MODULE_IRQ_TRUE@LoadPlugin irq
  @BUILD_MODULE_LOAD_TRUE@LoadPlugin load
  @BUILD_MODULE_MBMON_TRUE@LoadPlugin mbmon

diff --cc src/collectd.conf.pod
Simple merge