Build system: write_graphite doesn't depend on cURL.

Change-Id: Ide4fccdef64fc37434c87e662484930ab69b9f1b

diff --git a/configure.in b/configure.in
index d8fce2cc505c38f3d10b2e4849caf98dd9e47775..db63a3022d09f5fb0a21991269de28cbbdea0a05 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4759,7 +4759,7 @@ AC_PLUGIN([varnish],     [$with_libvarnish],   [Varnish cache statistics])
 AC_PLUGIN([vmem],        [$plugin_vmem],       [Virtual memory statistics])
 AC_PLUGIN([vserver],     [$plugin_vserver],    [Linux VServer statistics])
 AC_PLUGIN([wireless],    [$plugin_wireless],   [Wireless statistics])
-AC_PLUGIN([write_graphite], [$with_libcurl],   [Graphite / Carbon output plugin])
+AC_PLUGIN([write_graphite], [yes],             [Graphite / Carbon output plugin])
 AC_PLUGIN([write_http],  [$with_libcurl],      [HTTP output plugin])
 AC_PLUGIN([write_redis], [$with_libcredis],    [Redis output plugin])
 AC_PLUGIN([write_mongodb], [$with_libmongoc],  [MongoDB output plugin])

diff --git a/src/Makefile.am b/src/Makefile.am
index c41c13fb77dfe49de904e6bb38f988dd79df56ce..2f2acc0f099ff10918bb833a0206125b963d2d3e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1235,13 +1235,7 @@ pkglib_LTLIBRARIES += write_graphite.la
 write_graphite_la_SOURCES = write_graphite.c \
                        utils_format_json.c utils_format_json.h
 write_graphite_la_LDFLAGS = -module -avoid-version
-write_graphite_la_CFLAGS = $(AM_CFLAGS)
-write_graphite_la_LIBADD =
 collectd_LDADD += "-dlopen" write_graphite.la
-if BUILD_WITH_LIBCURL
-write_graphite_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS)
-write_graphite_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS)
-endif
 collectd_DEPENDENCIES += write_graphite.la
 endif