From: Rinigus <rinigus.git@gmail.com>
Date: Thu, 1 Sep 2016 20:08:36 +0000 (+0300)
Subject: battery_statefs: merge updates from upstream
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65e9d416c028d919efc2d901b782bb465c82f56b;p=thirdparty%2Fcollectd.git

battery_statefs: merge updates from upstream
---

65e9d416c028d919efc2d901b782bb465c82f56b
diff --cc configure.ac
index b2a8855fe,929205bc6..c5df2cb70
--- a/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 234a857ce,bc5f4294f..d4c94c2d5
--- a/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