From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 10 May 2016 09:52:36 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~18
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=56536633afb68ded68ac7bd012060cb9337fbcc5;p=collectd.git

Merge branch 'collectd-5.4' into collectd-5.5

Conflicts:
	src/Makefile.am
---

56536633afb68ded68ac7bd012060cb9337fbcc5
diff --cc src/Makefile.am
index e24d85b9,7f2c8862..0ab4e99b
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -877,17 -1032,21 +877,17 @@@ endi
  if BUILD_PLUGIN_RRDCACHED
  pkglib_LTLIBRARIES += rrdcached.la
  rrdcached_la_SOURCES = rrdcached.c utils_rrdcreate.c utils_rrdcreate.h
- rrdcached_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -rrdcached_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBRRD_LDFLAGS)
++rrdcached_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRRD_LDFLAGS)
  rrdcached_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBRRD_CFLAGS)
- rrdcached_la_LIBADD = $(BUILD_WITH_LIBRRD_LDFLAGS)
+ rrdcached_la_LIBADD = $(BUILD_WITH_LIBRRD_LIBS)
 -collectd_LDADD += "-dlopen" rrdcached.la
 -collectd_DEPENDENCIES += rrdcached.la
  endif
  
  if BUILD_PLUGIN_RRDTOOL
  pkglib_LTLIBRARIES += rrdtool.la
  rrdtool_la_SOURCES = rrdtool.c utils_rrdcreate.c utils_rrdcreate.h
- rrdtool_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -rrdtool_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBRRD_LDFLAGS)
++rrdtool_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRRD_LDFLAGS)
  rrdtool_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBRRD_CFLAGS)
- rrdtool_la_LIBADD = $(BUILD_WITH_LIBRRD_LDFLAGS)
+ rrdtool_la_LIBADD = $(BUILD_WITH_LIBRRD_LIBS)
 -collectd_LDADD += "-dlopen" rrdtool.la
 -collectd_DEPENDENCIES += rrdtool.la
  endif
  
  if BUILD_PLUGIN_SENSORS