Merge branch 'master' into sp/amqp

diff --combined src/Makefile.am
index 723ca7b,9d45920..222d916
--- 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
+ bin_PROGRAMS = collectd-nagios collectd-flush
  
  collectd_SOURCES = collectd.c collectd.h \
                   common.c common.h \
@@@ -105,21 -105,24 +105,34 @@@ endi
  collectd_nagios_LDADD += libcollectdclient/libcollectdclient.la
  collectd_nagios_DEPENDENCIES = libcollectdclient/libcollectdclient.la
  
+ 
+ collectd_flush_SOURCES = collectd-flush.c
+ collectd_flush_LDADD =
+ if BUILD_WITH_LIBSOCKET
+ collectd_flush_LDADD += -lsocket
+ endif
+ if BUILD_AIX
+ collectd_flush_LDADD += -lm
+ endif
+ collectd_flush_LDADD += libcollectdclient/libcollectdclient.la
+ collectd_flush_DEPENDENCIES = libcollectdclient/libcollectdclient.la
+ 
+ 
  pkglib_LTLIBRARIES = 
  
  BUILT_SOURCES = 
  CLEANFILES = 
  
 +if BUILD_PLUGIN_AMQP
 +pkglib_LTLIBRARIES += amqp.la
 +amqp_la_SOURCES = amqp.c 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