Merge branch 'ff/snmp'

diff --combined configure.in
index b05f987,f259bf6..443dbde
--- 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, 4.0.0-rc10)
 +AC_INIT(collectd, 4.0.0)
  AC_CONFIG_SRCDIR(src/collectd.c)
  AC_CONFIG_HEADERS(src/config.h)
  AM_INIT_AUTOMAKE(dist-bzip2)
@@@ -1349,6 -1349,7 +1349,7 @@@ AC_COLLECTD([ping],      [disable], [mo
  AC_COLLECTD([processes], [disable], [module], [processes statistics])
  AC_COLLECTD([sensors],   [disable], [module], [lm_sensors statistics])
  AC_COLLECTD([serial],    [disable], [module], [serial statistics])
+ AC_COLLECTD([snmp],      [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])
@@@ -1423,6 -1424,7 +1424,7 @@@ Configuration
      processes . . . . . $enable_processes
      sensors . . . . . . $enable_sensors
      serial  . . . . . . $enable_serial
+     snmp  . . . . . . . $enable_snmp
      swap  . . . . . . . $enable_swap
      syslog  . . . . . . $enable_syslog
      tape  . . . . . . . $enable_tape