From afabd3b6f9bce573b9878cc8e1085b88db77756a Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Fri, 3 Feb 2012 10:03:28 +0100 Subject: [PATCH] Build system: write_graphite doesn't depend on cURL. Change-Id: Ide4fccdef64fc37434c87e662484930ab69b9f1b --- configure.in | 2 +- src/Makefile.am | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/configure.in b/configure.in index d8fce2cc..db63a302 100644 --- 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 c41c13fb..2f2acc0f 100644 --- 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 -- 2.11.0