From f385de1e9f7799ff3af6347bd8f30506b9036c4e Mon Sep 17 00:00:00 2001 From: Paul Sadauskas Date: Thu, 9 Jul 2009 10:27:14 -0600 Subject: [PATCH] http plugin: Put the makefile stuff in the right place alphabetically --- configure.in | 2 +- src/Makefile.am | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configure.in b/configure.in index c435299a..e1dc8c64 100644 --- a/configure.in +++ b/configure.in @@ -3698,7 +3698,6 @@ AC_PLUGIN([couchdb], [$plugin_couchdb], [CouchDB statistics]) AC_PLUGIN([cpufreq], [$plugin_cpufreq], [CPU frequency statistics]) AC_PLUGIN([cpu], [$plugin_cpu], [CPU usage statistics]) AC_PLUGIN([csv], [yes], [CSV output plugin]) -AC_PLUGIN([http], [$with_libcurl], [HTTP output plugin]) AC_PLUGIN([curl], [$with_libcurl], [CURL generic web statistics]) AC_PLUGIN([dbi], [$with_libdbi], [General database statistics]) AC_PLUGIN([df], [$plugin_df], [Filesystem usage statistics]) @@ -3711,6 +3710,7 @@ AC_PLUGIN([filecount], [yes], [Count files in directories]) AC_PLUGIN([fscache], [$plugin_fscache], [fscache statistics]) AC_PLUGIN([gmond], [$with_libganglia], [Ganglia plugin]) AC_PLUGIN([hddtemp], [yes], [Query hddtempd]) +AC_PLUGIN([http], [$with_libcurl], [HTTP output plugin]) AC_PLUGIN([interface], [$plugin_interface], [Interface traffic statistics]) AC_PLUGIN([ipmi], [$plugin_ipmi], [IPMI sensor statistics]) AC_PLUGIN([iptables], [$with_libiptc], [IPTables rule counters]) diff --git a/src/Makefile.am b/src/Makefile.am index cfb726ce..d3e27f85 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -224,20 +224,6 @@ collectd_LDADD += "-dlopen" csv.la collectd_DEPENDENCIES += csv.la endif -if BUILD_PLUGIN_HTTP -pkglib_LTLIBRARIES += http.la -http_la_SOURCES = http.c -http_la_LDFLAGS = -module -avoid-version -http_la_CFLAGS = $(AM_CFLAGS) -http_la_LIBADD = -collectd_LDADD += "-dlopen" http.la -if BUILD_WITH_LIBCURL -http_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS) -http_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS) -endif -collectd_DEPENDENCIES += http.la -endif - if BUILD_PLUGIN_CURL pkglib_LTLIBRARIES += curl.la curl_la_SOURCES = curl.c @@ -361,6 +347,20 @@ collectd_LDADD += "-dlopen" hddtemp.la collectd_DEPENDENCIES += hddtemp.la endif +if BUILD_PLUGIN_HTTP +pkglib_LTLIBRARIES += http.la +http_la_SOURCES = http.c +http_la_LDFLAGS = -module -avoid-version +http_la_CFLAGS = $(AM_CFLAGS) +http_la_LIBADD = +collectd_LDADD += "-dlopen" http.la +if BUILD_WITH_LIBCURL +http_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS) +http_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS) +endif +collectd_DEPENDENCIES += http.la +endif + if BUILD_PLUGIN_INTERFACE pkglib_LTLIBRARIES += interface.la interface_la_SOURCES = interface.c -- 2.11.0