Merge branch 'collectd-3.10'

diff --combined configure.in
index 6834d22,679127e..5e76bd4
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -197,9 -197,6 +197,9 @@@ AC_CHECK_HEADERS(IOKit/storage/IOBlockS
  # For load module
  AC_CHECK_HEADERS(sys/loadavg.h)
  
 +# For the processes plugin
 +AC_CHECK_HEADERS(linux/config.h)
 +
  # For the swap module
  AC_CHECK_HEADERS(sys/swap.h)
  
@@@ -326,7 -323,7 +326,7 @@@ AC_CHECK_FUNCS(getifaddrs
  
  # For mount interface
  AC_CHECK_FUNCS(getfsent getvfsent listmntent)
- AC_CHECK_FUNCS(getfsstat)
+ AC_CHECK_FUNCS(getfsstat getvfsstat)
  
  # Check for different versions of `getmntent' here..
  AC_FUNC_GETMNTENT
@@@ -910,7 -907,6 +910,7 @@@ AC_COLLECTD([quota],     [enable],  [mo
  AC_COLLECTD([hddtemp],   [disable], [module], [hdd temperature statistics])
  AC_COLLECTD([load],      [disable], [module], [system load statistics])
  AC_COLLECTD([memory],    [disable], [module], [memory statistics])
 +AC_COLLECTD([multimeter],[disable], [module], [multimeter statistics])
  AC_COLLECTD([mysql],     [disable], [module], [mysql statistics])
  AC_COLLECTD([nfs],       [disable], [module], [nfs statistics])
  AC_COLLECTD([ntpd],      [disable], [module], [nfs statistics])
@@@ -958,7 -954,6 +958,7 @@@ Configuration
      hddtemp . . . . . . $enable_hddtemp
      load  . . . . . . . $enable_load
      memory  . . . . . . $enable_memory
 +    multimeter  . . . . $enable_multimeter
      mysql . . . . . . . $enable_mysql
      nfs . . . . . . . . $enable_nfs
      ntpd  . . . . . . . $enable_ntpd