X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.in;h=4732313a34a9b54cf7412ed97569217ef9fbf327;hb=131eda63f8958e63fb317f9584776b1311e49552;hp=84ce369ff9d352bed0104823d3e1c165b4f9cb6a;hpb=2c50a9c70721d4c8230c7a9bc63770e56578fb81;p=collectd.git diff --git a/configure.in b/configure.in index 84ce369f..4732313a 100644 --- a/configure.in +++ b/configure.in @@ -277,6 +277,20 @@ AC_CHECK_HEADERS(IOKit/ps/IOPowerSources.h, [], [], ]) # For the swap module +have_linux_wireless_h="no" +if test "x$ac_system" = "xLinux" +then + AC_CHECK_HEADERS(linux/wireless.h, + [have_linux_wireless_h="yes"], + [have_linux_wireless_h="no"], +[ +#include +#include +#include +]) +fi + +# For the swap module have_sys_swap_h="yes" AC_CHECK_HEADERS(sys/swap.h vm/anon.h, [], [have_sys_swap_h="no"], [ @@ -3422,9 +3436,9 @@ plugin_ascent="no" plugin_battery="no" plugin_bind="no" plugin_conntrack="no" -plugin_couchdb="no" plugin_cpu="no" plugin_cpufreq="no" +plugin_curl_json="no" plugin_df="no" plugin_disk="no" plugin_entropy="no" @@ -3434,7 +3448,6 @@ plugin_ipvs="no" plugin_irq="no" plugin_libvirt="no" plugin_load="no" -plugin_madwifi="no" plugin_memory="no" plugin_multimeter="no" plugin_nfs="no" @@ -3466,7 +3479,6 @@ then plugin_interface="yes" plugin_irq="yes" plugin_load="yes" - plugin_madwifi="yes" plugin_memory="yes" plugin_nfs="yes" plugin_fscache="yes" @@ -3544,7 +3556,7 @@ fi if test "x$with_libcurl" = "xyes" && test "x$with_libyajl" = "xyes" then - plugin_couchdb="yes" + plugin_curl_json="yes" fi if test "x$have_processor_info" = "xyes" @@ -3694,11 +3706,11 @@ AC_PLUGIN([ascent], [$plugin_ascent], [AscentEmu player statistics]) AC_PLUGIN([battery], [$plugin_battery], [Battery statistics]) AC_PLUGIN([bind], [$plugin_bind], [ISC Bind nameserver statistics]) AC_PLUGIN([conntrack], [$plugin_conntrack], [nf_conntrack statistics]) -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([curl], [$with_libcurl], [CURL generic web statistics]) +AC_PLUGIN([curl_json], [$plugin_curl_json], [CouchDB statistics]) AC_PLUGIN([dbi], [$with_libdbi], [General database statistics]) AC_PLUGIN([df], [$plugin_df], [Filesystem usage statistics]) AC_PLUGIN([disk], [$plugin_disk], [Disk usage statistics]) @@ -3719,7 +3731,7 @@ AC_PLUGIN([java], [$with_java], [Embed the Java Virtual Machine]) AC_PLUGIN([libvirt], [$plugin_libvirt], [Virtual machine statistics]) AC_PLUGIN([load], [$plugin_load], [System load]) AC_PLUGIN([logfile], [yes], [File logging plugin]) -AC_PLUGIN([madwifi], [$plugin_madwifi], [Madwifi wireless statistics]) +AC_PLUGIN([madwifi], [$have_linux_wireless_h], [Madwifi wireless statistics]) AC_PLUGIN([match_empty_counter], [yes], [The empty counter match]) AC_PLUGIN([match_regex], [yes], [The regex match]) AC_PLUGIN([match_timediff], [yes], [The timediff match]) @@ -3773,6 +3785,7 @@ AC_PLUGIN([uuid], [yes], [UUID as hostname plugin]) 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_http], [$with_libcurl], [HTTP output plugin]) AC_PLUGIN([xmms], [$with_libxmms], [XMMS statistics]) dnl Default configuration file @@ -3992,11 +4005,11 @@ Configuration: battery . . . . . . . $enable_battery bind . . . . . . . . $enable_bind conntrack . . . . . . $enable_conntrack - couchdb . . . . . . . $enable_couchdb cpu . . . . . . . . . $enable_cpu cpufreq . . . . . . . $enable_cpufreq csv . . . . . . . . . $enable_csv curl . . . . . . . . $enable_curl + curl_json . . . . . . $enable_curl_json dbi . . . . . . . . . $enable_dbi df . . . . . . . . . $enable_df disk . . . . . . . . $enable_disk @@ -4071,6 +4084,7 @@ Configuration: vmem . . . . . . . . $enable_vmem vserver . . . . . . . $enable_vserver wireless . . . . . . $enable_wireless + write_http . . . . . $enable_write_http xmms . . . . . . . . $enable_xmms EOF