From: Florian Forster <octo@collectd.org>
Date: Wed, 20 Feb 2019 09:05:09 +0000 (+0100)
Subject: Merge branch 'collectd-5.7' into collectd-5.8
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=da11ce02eb202b3e01d3e2d1b40f248a84430973;p=collectd.git

Merge branch 'collectd-5.7' into collectd-5.8
---

da11ce02eb202b3e01d3e2d1b40f248a84430973
diff --cc configure.ac
index d93b51b0,438d567f..0d1b49d5
--- a/configure.ac
+++ b/configure.ac
@@@ -6309,119 -6225,150 +6309,119 @@@ f
  
  
  # libstatgrab
 -if test "x$with_libstatgrab" = "xyes"
 -then
 -	plugin_cpu="yes"
 -	plugin_disk="yes"
 -	plugin_interface="yes"
 -	plugin_load="yes"
 -	plugin_memory="yes"
 -	plugin_swap="yes"
 -	plugin_users="yes"
 +if test "x$with_libstatgrab" = "xyes"; then
 +  plugin_cpu="yes"
 +  plugin_disk="yes"
 +  plugin_interface="yes"
 +  plugin_load="yes"
 +  plugin_memory="yes"
 +  plugin_swap="yes"
 +  plugin_users="yes"
 +fi
 +
 +if test "x$with_libcurl" = "xyes" && test "x$with_libxml2" = "xyes"; then
 +  plugin_ascent="yes"
 +  if test "x$have_strptime" = "xyes"; then
 +    plugin_bind="yes"
 +  fi
  fi
  
 -if test "x$with_libcurl" = "xyes" && test "x$with_libxml2" = "xyes"
 -then
 -	plugin_ascent="yes"
 -	if test "x$have_strptime" = "xyes"
 -	then
 -		plugin_bind="yes"
 -	fi
 +if test "x$with_libopenipmipthread" = "xyes"; then
 +  plugin_ipmi="yes"
  fi
  
 -if test "x$with_libopenipmipthread" = "xyes"
 -then
 -	plugin_ipmi="yes"
 +if test "x$with_libcurl" = "xyes" && test "x$with_libyajl" = "xyes"; then
 +  plugin_curl_json="yes"
  fi
  
 -if test "x$with_libcurl" = "xyes" && test "x$with_libyajl" = "xyes"
 -then
 -	plugin_curl_json="yes"
 +if test "x$with_libcurl" = "xyes" && test "x$with_libxml2" = "xyes"; then
 +  plugin_curl_xml="yes"
  fi
  
 -if test "x$with_libcurl" = "xyes" && test "x$with_libxml2" = "xyes"
 -then
 -	plugin_curl_xml="yes"
 +if test "x$with_libyajl" = "xyes"; then
 +  plugin_ceph="yes"
  fi
  
 -if test "x$with_libyajl" = "xyes"
 -then
 -	plugin_ceph="yes"
 +if test "x$have_processor_info" = "xyes"; then
 +  plugin_cpu="yes"
  fi
  
 -if test "x$have_processor_info" = "xyes"
 -then
 -	plugin_cpu="yes"
 +if test "x$have_sysctl" = "xyes"; then
 +  plugin_cpu="yes"
 +  plugin_memory="yes"
 +  plugin_uptime="yes"
 +  if test "x$ac_system" = "xDarwin"; then
 +    plugin_swap="yes"
 +  fi
  fi
 -if test "x$have_sysctl" = "xyes"
 -then
 -	plugin_cpu="yes"
 -	plugin_memory="yes"
 -	plugin_uptime="yes"
 -	if test "x$ac_system" = "xDarwin"
 -	then
 -		plugin_swap="yes"
 -	fi
 -fi
 -if test "x$have_sysctlbyname" = "xyes"
 -then
 -	plugin_contextswitch="yes"
 -	plugin_cpu="yes"
 -	plugin_memory="yes"
 -	plugin_tcpconns="yes"
 +
 +if test "x$have_sysctlbyname" = "xyes"; then
 +  plugin_contextswitch="yes"
 +  plugin_cpu="yes"
 +  plugin_memory="yes"
 +  plugin_tcpconns="yes"
  fi
  
 -# Df plugin: Check if we know how to determine mount points first.
 -#if test "x$have_listmntent" = "xyes"; then
 -#	plugin_df="yes"
 -#fi
 -if test "x$have_getvfsstat" = "xyes" || test "x$have_getfsstat" = "xyes"
 -then
 -	plugin_df="yes"
 +if test "x$have_getvfsstat" = "xyes" || test "x$have_getfsstat" = "xyes"; then
 +  plugin_df="yes"
  fi
 -if test "x$c_cv_have_two_getmntent" = "xyes" || test "x$have_getmntent" = "xgen" || test "x$have_getmntent" = "xsun"
 -then
 -	plugin_df="yes"
 +
 +if test "x$c_cv_have_two_getmntent" = "xyes" || test "x$have_getmntent" = "xgen" || test "x$have_getmntent" = "xsun"; then
 +  plugin_df="yes"
  fi
 -#if test "x$have_getmntent" = "xseq"
 -#then
 -#	plugin_df="yes"
 -#fi
 -if test "x$c_cv_have_one_getmntent" = "xyes"
 -then
 -	plugin_df="yes"
 +
 +if test "x$c_cv_have_one_getmntent" = "xyes"; then
 +  plugin_df="yes"
  fi
  
- if test "x$c_cv_have_getmntent_r" = "xyes"; then
 -if test "x$have_getmntent_r" = "xyes"
 -then
 -	plugin_df="yes"
++if test "x$have_getmntent_r" = "xyes"; then
 +  plugin_df="yes"
  fi
  
 -# Df plugin: Check if we have either `statfs' or `statvfs' second.
 -if test "x$plugin_df" = "xyes"
 -then
 -	plugin_df="no"
 -	if test "x$have_statfs" = "xyes"
 -	then
 -		plugin_df="yes"
 -	fi
 -	if test "x$have_statvfs" = "xyes"
 -	then
 -		plugin_df="yes"
 -	fi
 -fi
 -
 -if test "x$have_linux_sockios_h$have_linux_ethtool_h" = "xyesyes"
 -then
 -	plugin_ethstat="yes"
 +if test "x$plugin_df" = "xyes"; then
 +  plugin_df="no"
 +  if test "x$have_statfs" = "xyes"; then
 +    plugin_df="yes"
 +  fi
 +
 +  if test "x$have_statvfs" = "xyes"; then
 +    plugin_df="yes"
 +  fi
  fi
  
 -if test "x$with_libgrpcpp" = "xyes" && test "x$with_libprotobuf" = "xyes" && test "x$have_protoc3" = "xyes" && test "x$GRPC_CPP_PLUGIN" != "x"
 -then
 -	plugin_grpc="yes"
 +if test "x$have_linux_sockios_h" = "xyes" && test "x$have_linux_ethtool_h" = "xyes"; then
 +  plugin_ethstat="yes"
  fi
  
 -if test "x$have_getifaddrs" = "xyes"
 -then
 -	plugin_interface="yes"
 +if test "x$with_libgps" = "xyes"; then
 +  plugin_gps="yes"
  fi
  
 -if test "x$with_libgps" = "xyes"
 -then
 -	plugin_gps="yes"
 +if test "x$with_libgrpcpp" = "xyes" && test "x$with_libprotobuf" = "xyes" && test "x$have_protoc3" = "xyes" && test "x$GRPC_CPP_PLUGIN" != "x"; then
 +  plugin_grpc="yes"
  fi
  
 -if test "x$have_getloadavg" = "xyes"
 -then
 -	plugin_load="yes"
 +if test "x$have_getifaddrs" = "xyes"; then
 +  plugin_interface="yes"
  fi
  
 -if test "x$with_libyajl" = "xyes"
 -then
 -	plugin_log_logstash="yes"
 +if test "x$have_getloadavg" = "xyes"; then
 +  plugin_load="yes"
  fi
  
 -if test "x$c_cv_have_libperl$c_cv_have_perl_ithreads" = "xyesyes"
 -then
 -	plugin_perl="yes"
 +if test "x$with_libyajl" = "xyes"; then
 +  plugin_log_logstash="yes"
  fi
  
 -if test "x$have_protoc_c" = "xyes" && test "x$with_libprotobuf_c" = "xyes"
 -then
 -	plugin_pinba="yes"
 -	if test "x$with_libmicrohttpd" = "xyes"
 -	then
 -		plugin_write_prometheus="yes"
 -	fi
 +if test "x$with_libperl" = "xyes" && test "x$c_cv_have_perl_ithreads" = "xyes"; then
 +  plugin_perl="yes"
 +fi
 +
 +if test "x$have_protoc_c" = "xyes" && test "x$with_libprotobuf_c" = "xyes"; then
 +  plugin_pinba="yes"
 +  if test "x$with_libmicrohttpd" = "xyes"; then
 +    plugin_write_prometheus="yes"
 +  fi
  fi
  
  # Mac OS X memory interface