Merge remote-tracking branch 'origin/pr/1188'

diff --combined configure.ac
index 8129468,3378122..6a71154
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -3749,8 -3749,8 +3749,8 @@@ f
  # }}} --with-python
  
  # --with-librabbitmq {{{
 -with_librabbitmq_cppflags="-I/usr/local/include"
 -with_librabbitmq_ldflags="-L/usr/local/lib"
 +with_librabbitmq_cppflags=""
 +with_librabbitmq_ldflags=""
  AC_ARG_WITH(librabbitmq, [AS_HELP_STRING([--with-librabbitmq@<:@=PREFIX@:>@], [Path to librabbitmq.])],
  [
        if test "x$withval" != "xno" && test "x$withval" != "xyes"
@@@ -5262,7 -5262,6 +5262,7 @@@ plugin_disk="no
  plugin_drbd="no"
  plugin_entropy="no"
  plugin_ethstat="no"
 +plugin_fhcount="no"
  plugin_fscache="no"
  plugin_interface="no"
  plugin_ipmi="no"
@@@ -5306,7 -5305,6 +5306,7 @@@ the
        plugin_disk="yes"
        plugin_drbd="yes"
        plugin_entropy="yes"
 +      plugin_fhcount="yes"
        plugin_fscache="yes"
        plugin_interface="yes"
        plugin_ipc="yes"
@@@ -5362,6 -5360,7 +5362,7 @@@ f
  
  if test "x$ac_system" = "xFreeBSD"
  then
+       plugin_disk="yes"
        plugin_zfs_arc="yes"
  fi
  
@@@ -5651,7 -5650,7 +5652,7 @@@ AC_PLUGIN([email],       [yes]
  AC_PLUGIN([entropy],     [$plugin_entropy],    [Entropy statistics])
  AC_PLUGIN([ethstat],     [$plugin_ethstat],    [Stats from NIC driver])
  AC_PLUGIN([exec],        [yes],                [Execution of external programs])
 -AC_PLUGIN([fhcount],     [yes],                [File handles statistics])
 +AC_PLUGIN([fhcount],     [$plugin_fhcount],    [File handles statistics])
  AC_PLUGIN([filecount],   [yes],                [Count files in directories])
  AC_PLUGIN([fscache],     [$plugin_fscache],    [fscache statistics])
  AC_PLUGIN([gmond],       [$with_libganglia],   [Ganglia plugin])