From: Florian Forster <octo@collectd.org>
Date: Sat, 16 Mar 2013 12:44:01 +0000 (+0100)
Subject: Merge branch 'collectd-5.2'
X-Git-Tag: collectd-5.3.0~36
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=7285e5f59ffa4efb391485fe9b35ee02f3dc856f;hp=-c;p=collectd.git

Merge branch 'collectd-5.2'

Conflicts:
	src/plugin.c
---

7285e5f59ffa4efb391485fe9b35ee02f3dc856f
diff --combined src/Makefile.am
index 799725a2,aa014100..9c8636c4
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -90,6 -90,7 +90,7 @@@ collectdmon_SOURCES = collectdmon.
  collectdmon_CPPFLAGS = $(AM_CPPFLAGS)
  
  collectd_nagios_SOURCES = collectd-nagios.c
+ collectd_nagios_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/libcollectdclient/collectd
  collectd_nagios_LDADD =
  if BUILD_WITH_LIBSOCKET
  collectd_nagios_LDADD += -lsocket
@@@ -103,6 -104,7 +104,7 @@@ collectd_nagios_DEPENDENCIES = libcolle
  
  
  collectdctl_SOURCES = collectdctl.c
+ collectdctl_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/libcollectdclient/collectd
  collectdctl_LDADD =
  if BUILD_WITH_LIBSOCKET
  collectdctl_LDADD += -lsocket
@@@ -115,6 -117,7 +117,7 @@@ collectdctl_DEPENDENCIES = libcollectdc
  
  collectd_tg_SOURCES = collectd-tg.c \
  		      utils_heap.c utils_heap.h
+ collectd_tg_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/libcollectdclient/collectd
  collectd_tg_LDADD =
  if BUILD_WITH_LIBSOCKET
  collectd_tg_LDADD += -lsocket
@@@ -1339,17 -1342,6 +1342,17 @@@ collectd_LDADD += "-dlopen" write_redis
  collectd_DEPENDENCIES += write_redis.la
  endif
  
 +if BUILD_PLUGIN_WRITE_RIEMANN
 +BUILT_SOURCES += riemann.pb-c.c riemann.pb-c.h
 +CLEANFILES += riemann.pb-c.c riemann.pb-c.h
 +pkglib_LTLIBRARIES += write_riemann.la
 +write_riemann_la_SOURCES = write_riemann.c riemann.pb-c.c
 +write_riemann_la_LDFLAGS = -module -avoid-version
 +write_riemann_la_LIBADD = -lprotobuf-c
 +collectd_LDADD += "-dlopen" write_riemann.la
 +collectd_DEPENDENCIES += write_riemann.la
 +endif
 +
  if BUILD_PLUGIN_XMMS
  pkglib_LTLIBRARIES += xmms.la
  xmms_la_SOURCES = xmms.c
@@@ -1390,7 -1382,7 +1393,7 @@@ dist_man_MANS = collectd.1 
  
  #collectd_1_SOURCES = collectd.pod
  
 -EXTRA_DIST = types.db pinba.proto
 +EXTRA_DIST = types.db pinba.proto riemann.proto
  
  EXTRA_DIST +=   collectd.conf.pod \
  		collectd-email.pod \
@@@ -1428,9 -1420,6 +1431,9 @@@
  pinba.pb-c.c pinba.pb-c.h: pinba.proto
  	protoc-c -I$(srcdir) --c_out . $(srcdir)/pinba.proto
  
 +riemann.pb-c.c riemann.pb-c.h: riemann.proto
 +	protoc-c -I$(srcdir) --c_out . $(srcdir)/riemann.proto
 +
  install-exec-hook:
  	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
  	if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \