Merge branch 'master' into ff/netlib

diff --combined configure.in
index ba11dc3c249139d343ff0215eeef5245ef98bc1b,5d82c47c993775e934c7dcbee721a795c1b1c7a1..af584425ae890d9c9087471de9b8c943e49703d1
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -91,6 -91,10 +91,10 @@@ if test "x$ac_system" = "xSolaris
  then
        AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [Define to enforce POSIX thread semantics under Solaris.])
  fi
+ if test "x$ac_system" = "xAIX"
+ then
+       AC_DEFINE(_THREAD_SAFE_ERRNO, 1, [Define to use the thread-safe version of errno under AIX.])
+ fi
  
  # Where to install .pc files.
  pkgconfigdir="${libdir}/pkgconfig"
@@@ -1193,6 -1197,12 +1197,12 @@@ f
  if test "x$with_perfstat" = "xyes"
  then
         AC_DEFINE(HAVE_PERFSTAT, 1, [Define to 1 if you have the 'perfstat' library (-lperfstat)])
+        # struct members pertaining to donation have been added to libperfstat somewhere between AIX5.3ML5 and AIX5.3ML9
+        AC_CHECK_MEMBER([perfstat_partition_type_t.b.donate_enabled], [], [], [[#include <libperfstat.h]])
+        if test "x$av_cv_member_perfstat_partition_type_t_b_donate_enabled" = "xyes"
+        then
+               AC_DEFINE(PERFSTAT_SUPPORTS_DONATION, 1, [Define to 1 if your version of the 'perfstat' library supports donation])
+        fi
  fi
  AM_CONDITIONAL(BUILD_WITH_PERFSTAT, test "x$with_perfstat" = "xyes")
  
@@@ -3109,6 -3119,57 +3119,57 @@@ the
  fi
  # }}} --with-python
  
+ # --with-librabbitmq {{{
+ 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"
+       then
+               with_librabbitmq_cppflags="-I$withval/include"
+               with_librabbitmq_ldflags="-L$withval/lib"
+               with_librabbitmq="yes"
+       else
+               with_librabbitmq="$withval"
+       fi
+ ],
+ [
+       with_librabbitmq="yes"
+ ])
+ if test "x$with_librabbitmq" = "xyes"
+ then
+       SAVE_CPPFLAGS="$CPPFLAGS"
+       CPPFLAGS="$CPPFLAGS $with_librabbitmq_cppflags"
+ 
+       AC_CHECK_HEADERS(amqp.h, [with_librabbitmq="yes"], [with_librabbitmq="no (amqp.h not found)"])
+ 
+       CPPFLAGS="$SAVE_CPPFLAGS"
+ fi
+ if test "x$with_librabbitmq" = "xyes"
+ then
+       SAVE_CPPFLAGS="$CPPFLAGS"
+       SAVE_LDFLAGS="$LDFLAGS"
+       CPPFLAGS="$CPPFLAGS $with_librabbitmq_cppflags"
+       LDFLAGS="$LDFLAGS $with_librabbitmq_ldflags"
+ 
+       AC_CHECK_LIB(rabbitmq, amqp_basic_publish, [with_librabbitmq="yes"], [with_librabbitmq="no (Symbol 'amqp_basic_publish' not found)"])
+ 
+       CPPFLAGS="$SAVE_CPPFLAGS"
+       LDFLAGS="$SAVE_LDFLAGS"
+ fi
+ if test "x$with_librabbitmq" = "xyes"
+ then
+       BUILD_WITH_LIBRABBITMQ_CPPFLAGS="$with_librabbitmq_cppflags"
+       BUILD_WITH_LIBRABBITMQ_LDFLAGS="$with_librabbitmq_ldflags"
+       BUILD_WITH_LIBRABBITMQ_LIBS="-lrabbitmq"
+       AC_SUBST(BUILD_WITH_LIBRABBITMQ_CPPFLAGS)
+       AC_SUBST(BUILD_WITH_LIBRABBITMQ_LDFLAGS)
+       AC_SUBST(BUILD_WITH_LIBRABBITMQ_LIBS)
+       AC_DEFINE(HAVE_LIBRABBITMQ, 1, [Define if librabbitmq is present and usable.])
+ fi
+ AM_CONDITIONAL(BUILD_WITH_LIBRABBITMQ, test "x$with_librabbitmq" = "xyes")
+ # }}}
+ 
  # --with-librouteros {{{
  AC_ARG_WITH(librouteros, [AS_HELP_STRING([--with-librouteros@<:@=PREFIX@:>@], [Path to librouteros.])],
  [
@@@ -4334,6 -4395,7 +4395,7 @@@ the
  fi
  if test "x$have_sysctlbyname" = "xyes"
  then
+       plugin_contextswitch="yes"
        plugin_cpu="yes"
        plugin_memory="yes"
        plugin_tcpconns="yes"
@@@ -4461,6 -4523,7 +4523,7 @@@ AC_ARG_ENABLE([all-plugins]
  
  m4_divert_once([HELP_ENABLE], [])
  
+ AC_PLUGIN([amqp],        [$with_librabbitmq],  [AMQP output plugin])
  AC_PLUGIN([apache],      [$with_libcurl],      [Apache httpd statistics])
  AC_PLUGIN([apcups],      [yes],                [Statistics of UPSes by APC])
  AC_PLUGIN([apple_sensors], [$with_libiokit],   [Apple's hardware sensors])
@@@ -4495,6 -4558,7 +4558,7 @@@ AC_PLUGIN([java],        [$with_java]
  AC_PLUGIN([libvirt],     [$plugin_libvirt],    [Virtual machine statistics])
  AC_PLUGIN([load],        [$plugin_load],       [System load])
  AC_PLUGIN([logfile],     [yes],                [File logging plugin])
+ AC_PLUGIN([lpar],        [$with_perfstat],     [AIX logical partitions statistics])
  AC_PLUGIN([madwifi],     [$have_linux_wireless_h], [Madwifi wireless statistics])
  AC_PLUGIN([match_empty_counter], [yes],        [The empty counter match])
  AC_PLUGIN([match_hashed], [yes],               [The hashed match])
@@@ -4697,7 -4761,7 +4761,7 @@@ AC_SUBST(LCC_VERSION_PATCH
  AC_SUBST(LCC_VERSION_EXTRA)
  AC_SUBST(LCC_VERSION_STRING)
  
 -AC_CONFIG_FILES(src/libcollectdclient/lcc_features.h)
 +AC_CONFIG_FILES(src/libcollectdclient/collectd/lcc_features.h)
  
  AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/owniptc/Makefile src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile bindings/Makefile bindings/java/Makefile)
  
@@@ -4760,6 -4824,7 +4824,7 @@@ Configuration
      libperl . . . . . . . $with_libperl
      libpq . . . . . . . . $with_libpq
      libpthread  . . . . . $with_libpthread
+     librabbitmq . . . . . $with_librabbitmq
      librouteros . . . . . $with_librouteros
      librrd  . . . . . . . $with_librrd
      libsensors  . . . . . $with_libsensors
@@@ -4784,6 -4849,7 +4849,7 @@@
      perl  . . . . . . . . $with_perl_bindings
  
    Modules:
+     amqp    . . . . . . . $enable_amqp
      apache  . . . . . . . $enable_apache
      apcups  . . . . . . . $enable_apcups
      apple_sensors . . . . $enable_apple_sensors
@@@ -4818,6 -4884,7 +4884,7 @@@
      libvirt . . . . . . . $enable_libvirt
      load  . . . . . . . . $enable_load
      logfile . . . . . . . $enable_logfile
+     lpar... . . . . . . . $enable_lpar
      madwifi . . . . . . . $enable_madwifi
      match_empty_counter . $enable_match_empty_counter
      match_hashed  . . . . $enable_match_hashed

diff --combined src/Makefile.am
index 025476afeb8866140c2fcde2c23eb941ee6e1016,247892bb5f45ba66734e7c527c09ffdc3572914f..e64e167cf11e59fceac7339d95507290ed9bb272
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -21,7 -21,7 +21,7 @@@ AM_CPPFLAGS += -DPLUGINDIR='"${pkglibdi
  AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"'
  
  sbin_PROGRAMS = collectd collectdmon
 -bin_PROGRAMS = collectd-nagios collectdctl
 +bin_PROGRAMS = collectd-nagios collectdctl collectd-tg
  
  collectd_SOURCES = collectd.c collectd.h \
                   common.c common.h \
@@@ -117,24 -117,24 +117,36 @@@ endi
  collectdctl_LDADD += libcollectdclient/libcollectdclient.la
  collectdctl_DEPENDENCIES = libcollectdclient/libcollectdclient.la
  
 +collectd_tg_SOURCES = collectd-tg.c \
 +                    utils_heap.c utils_heap.h
 +collectd_tg_LDADD =
 +if BUILD_WITH_LIBSOCKET
 +collectd_tg_LDADD += -lsocket
 +endif
 +if BUILD_AIX
 +collectd_tg_LDADD += -lm
 +endif
 +collectd_tg_LDADD += libcollectdclient/libcollectdclient.la
 +collectd_tg_DEPENDENCIES = libcollectdclient/libcollectdclient.la
 +
  
  pkglib_LTLIBRARIES = 
  
  BUILT_SOURCES = 
  CLEANFILES = 
  
+ if BUILD_PLUGIN_AMQP
+ pkglib_LTLIBRARIES += amqp.la
+ amqp_la_SOURCES = amqp.c \
+                 utils_cmd_putval.c utils_cmd_putval.h \
+                 utils_format_json.c utils_format_json.h
+ amqp_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBRABBITMQ_LDFLAGS)
+ amqp_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBRABBITMQ_CPPFLAGS)
+ amqp_la_LIBADD = $(BUILD_WITH_LIBRABBITMQ_LIBS)
+ collectd_LDADD += "-dlopen" amqp.la
+ collectd_DEPENDENCIES += amqp.la
+ endif
+ 
  if BUILD_PLUGIN_APACHE
  pkglib_LTLIBRARIES += apache.la
  apache_la_SOURCES = apache.c
@@@ -524,6 -524,15 +536,15 @@@ collectd_LDADD += "-dlopen" logfile.l
  collectd_DEPENDENCIES += logfile.la
  endif
  
+ if BUILD_PLUGIN_LPAR
+ pkglib_LTLIBRARIES += lpar.la
+ lpar_la_SOURCES = lpar.c
+ lpar_la_LDFLAGS = -module -avoid-version
+ collectd_LDADD += "-dlopen" lpar.la
+ collectd_DEPENDENCIES += lpar.la
+ lpar_la_LIBADD = -lperfstat
+ endif
+ 
  if BUILD_PLUGIN_MADWIFI
  pkglib_LTLIBRARIES += madwifi.la
  madwifi_la_SOURCES = madwifi.c madwifi.h