From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Sat, 1 Aug 2015 07:30:22 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c864f5e634118fce2446ebbba96a1cb7ec39dda;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-5.4' into collectd-5.5
---

8c864f5e634118fce2446ebbba96a1cb7ec39dda
diff --cc src/Makefile.am
index c718621e9,36b6bd772..07ffdda9c
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -99,11 -152,14 +99,12 @@@ if BUILD_PLUGIN_AMQ
  pkglib_LTLIBRARIES += amqp.la
  amqp_la_SOURCES = amqp.c \
  		  utils_cmd_putval.c utils_cmd_putval.h \
+   	          utils_parse_option.c utils_parse_option.h \
  		  utils_format_graphite.c utils_format_graphite.h \
  		  utils_format_json.c utils_format_json.h
 -amqp_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBRABBITMQ_LDFLAGS)
 +amqp_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(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