http plugin: Put the makefile stuff in the right place alphabetically

diff --git a/configure.in b/configure.in
index c435299ab8cb4155f4bf3f634fb1f84952642097..e1dc8c641a38dc9feb0b756c17955b305a26a8df 100644 (file)
--- 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 cfb726ce1260484610f7cd377bb48a669fffc055..d3e27f85884d505ed00e1c443d4b29e062ef3ab0 100644 (file)
--- 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