Merge branch 'collectd-3.11' into merge/collectd-4

Conflicts:

	src/multimeter.c
	src/plugin.c

diff --combined configure.in
index 09e1a18,602d0fa..a6bc941
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1,5 -1,5 +1,5 @@@
  dnl Process this file with autoconf to produce a configure script.
- AC_INIT(collectd, 3.11.1)
+ AC_INIT(collectd, 3.11.2)
  AC_CONFIG_SRCDIR(src/collectd.c)
  AC_CONFIG_HEADERS(src/config.h)
  AM_INIT_AUTOMAKE(dist-bzip2)
@@@ -44,7 -44,7 +44,7 @@@ AC_CHECK_HEADERS(assert.h
  AC_CHECK_HEADERS(sys/types.h)
  AC_CHECK_HEADERS(sys/socket.h)
  AC_CHECK_HEADERS(sys/select.h)
 -AC_CHECK_HEADERS(sys/poll.h)
 +AC_CHECK_HEADERS(poll.h)
  AC_CHECK_HEADERS(netdb.h)
  AC_CHECK_HEADERS(arpa/inet.h)
  AC_CHECK_HEADERS(sys/resource.h)
@@@ -149,23 -149,6 +149,23 @@@ AC_CHECK_HEADERS(netinet/icmp6.h, [], [
  # include <netinet/ip6.h>
  #endif
  ])
 +AC_CHECK_HEADERS(netinet/tcp.h, [], [],
 +[#if HAVE_STDINT_H
 +# include <stdint.h>
 +#endif
 +#if HAVE_SYS_TYPES_H
 +# include <sys/types.h>
 +#endif
 +#if HAVE_NETINET_IN_SYSTM_H
 +# include <netinet/in_systm.h>
 +#endif
 +#if HAVE_NETINET_IN_H
 +# include <netinet/in.h>
 +#endif
 +#if HAVE_NETINET_IP_H
 +# include <netinet/ip.h>
 +#endif
 +])
  AC_CHECK_HEADERS(netinet/udp.h, [], [],
  [#if HAVE_STDINT_H
  # include <stdint.h>
@@@ -326,10 -309,6 +326,10 @@@ AC_CHECK_HEADERS(net/if_arp.h
  AC_CHECK_HEADERS(net/if_ppp.h)
  AC_CHECK_HEADERS(netinet/if_ether.h)
  
 +# For the multimeter plugin
 +AC_CHECK_HEADERS(termios.h)
 +AC_CHECK_HEADERS(sys/ioctl.h)
 +
  dnl Checking for libraries
  AC_CHECK_LIB(m, ext)
  
@@@ -1062,18 -1041,16 +1062,18 @@@ AC_COLLECTD([battery],   [disable], [mo
  AC_COLLECTD([cpu],       [disable], [module], [cpu usage statistics])
  AC_COLLECTD([cpufreq],   [disable], [module], [system cpu frequency statistics])
  AC_COLLECTD([disk],      [disable], [module], [disk/partition statistics])
 +AC_COLLECTD([csv],       [disable], [module], [csv output plugin])
  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([hddtemp],   [disable], [module], [hdd temperature statistics])
  AC_COLLECTD([load],      [disable], [module], [system load statistics])
  AC_COLLECTD([mbmon],     [disable], [module], [motherboard monitor statistics])
  AC_COLLECTD([memory],    [disable], [module], [memory statistics])
  AC_COLLECTD([multimeter],[disable], [module], [multimeter statistics])
  AC_COLLECTD([mysql],     [disable], [module], [mysql statistics])
 +AC_COLLECTD([network],   [disable], [module], [network functionality])
  AC_COLLECTD([nfs],       [disable], [module], [nfs statistics])
  AC_COLLECTD([ntpd],      [disable], [module], [nfs statistics])
  AC_COLLECTD([ping],      [disable], [module], [ping statistics])
@@@ -1083,7 -1060,6 +1083,7 @@@ AC_COLLECTD([serial],    [disable], [mo
  AC_COLLECTD([swap],      [disable], [module], [swap statistics])
  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])
  AC_COLLECTD([wireless],  [disable], [module], [wireless link statistics])
@@@ -1118,19 -1094,16 +1118,19 @@@ Configuration
      battery . . . . . . $enable_battery
      cpu . . . . . . . . $enable_cpu
      cpufreq . . . . . . $enable_cpufreq
 +    csv . . . . . . . . $enable_csv
      df  . . . . . . . . $enable_df
      disk  . . . . . . . $enable_disk
      dns . . . . . . . . $enable_dns
      email . . . . . . . $enable_email
 +    entropy . . . . . . $enable_entropy
      hddtemp . . . . . . $enable_hddtemp
      load  . . . . . . . $enable_load
      mbmon . . . . . . . $enable_mbmon
      memory  . . . . . . $enable_memory
      multimeter  . . . . $enable_multimeter
      mysql . . . . . . . $enable_mysql
 +    network . . . . . . $enable_network
      nfs . . . . . . . . $enable_nfs
      ntpd  . . . . . . . $enable_ntpd
      ping  . . . . . . . $enable_ping
@@@ -1140,7 -1113,6 +1140,7 @@@
      swap  . . . . . . . $enable_swap
      tape  . . . . . . . $enable_tape
      traffic . . . . . . $enable_traffic
 +    unixsock  . . . . . $enable_unixsock
      users . . . . . . . $enable_users
      vserver . . . . . . $enable_vserver
      wireless  . . . . . $enable_wireless