battery_statefs: merge updates from upstream

diff --cc README
Simple merge

diff --cc configure.ac
index b2a8855feedf6bf2bdac9f676965caefcd52ea84,929205bc672f7550cf610960668440326afd1371..c5df2cb705960cb926d2a803b58379e1c17157de
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -5557,11 -5721,12 +5721,13 @@@ plugin_multimeter="no
  plugin_nfs="no"
  plugin_numa="no"
  plugin_perl="no"
+ plugin_pinba="no"
  plugin_processes="no"
  plugin_protocols="no"
+ plugin_python="no"
  plugin_serial="no"
  plugin_smart="no"
 +plugin_statefs_battery="no"
  plugin_swap="no"
  plugin_tape="no"
  plugin_tcpconns="no"
@@@ -5621,11 -5787,11 +5788,14 @@@ the
        then
                plugin_turbostat="yes"
        fi
- 
 -      
 +      if test "x$enable_statefs_battery" = "xyes"
 +      then
 +              plugin_statefs_battery="yes"
 +      fi
+       if test "x$c_cv_have_clock_boottime_monotonic" = "xyes"
+       then
+               plugin_cpusleep="yes"
+       fi
  fi
  
  if test "x$ac_system" = "xOpenBSD"

diff --cc src/Makefile.am
index 234a857ce54a620292e97cf23949087c9ea1305b,bc5f4294f13746c91e4b824df99930025b4258ad..d4c94c2d59b7ce8bd7f50fb4c12e57a1e25d2737
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -975,21 -1021,11 +1021,17 @@@ endi
  if BUILD_PLUGIN_SNMP
  pkglib_LTLIBRARIES += snmp.la
  snmp_la_SOURCES = snmp.c
- snmp_la_LDFLAGS = $(PLUGIN_LDFLAGS)
- snmp_la_CFLAGS = $(AM_CFLAGS)
- snmp_la_LIBADD =
- if BUILD_WITH_LIBNETSNMP
- snmp_la_CFLAGS += $(BUILD_WITH_LIBSNMP_CFLAGS)
- snmp_la_LIBADD += $(BUILD_WITH_LIBSNMP_LIBS)
- endif
+ snmp_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBNETSNMP_CPPFLAGS)
+ snmp_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBNETSNMP_LDFLAGS)
+ snmp_la_LIBADD = $(BUILD_WITH_LIBNETSNMP_LIBS)
  endif
  
 +if BUILD_PLUGIN_STATEFS_BATTERY
 +pkglib_LTLIBRARIES += statefs_battery.la
 +statefs_battery_la_SOURCES = statefs_battery.c
 +statefs_battery_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 +endif
 +
  if BUILD_PLUGIN_STATSD
  pkglib_LTLIBRARIES += statsd.la
  statsd_la_SOURCES = statsd.c

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

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

diff --cc src/types.db
Simple merge