Merge branch 'ok/disk' into collectd-4.4

Conflicts:

	configure.in

diff --combined configure.in
index 7e11fc8,e94730d..e95f99d
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -2331,7 -2331,7 +2331,8 @@@ f
  # libstatgrab
  if test "x$with_libstatgrab" = "xyes"
  then
 +      plugin_cpu="yes"
+       plugin_disk="yes"
        plugin_interface="yes"
        plugin_load="yes"
        plugin_memory="yes"

diff --combined src/Makefile.am
index 0ba4ab8,d68d036..88041b9
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -152,10 -152,6 +152,10 @@@ endi
  if BUILD_WITH_LIBDEVINFO
  cpu_la_LDFLAGS += -ldevinfo
  endif
 +if BUILD_WITH_LIBSTATGRAB
 +cpu_la_CFLAGS = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
 +cpu_la_LIBADD = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
 +endif
  collectd_LDADD += "-dlopen" cpu.la
  collectd_DEPENDENCIES += cpu.la
  endif
@@@ -197,6 -193,10 +197,10 @@@ endi
  if BUILD_WITH_LIBIOKIT
  disk_la_LDFLAGS += -lIOKit
  endif
+ if BUILD_WITH_LIBSTATGRAB
+ disk_la_CFLAGS = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)  
+ disk_la_LIBADD = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
+ endif
  collectd_LDADD += "-dlopen" disk.la
  collectd_DEPENDENCIES += disk.la
  endif