From: Andrew Bays Date: Wed, 4 Sep 2019 17:12:23 +0000 (-0400) Subject: Fix merge conflicts X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=eb6f39121fa48db23021d0089bbbdd4616a8cccc;hp=-c;p=collectd.git Fix merge conflicts --- eb6f39121fa48db23021d0089bbbdd4616a8cccc diff --combined AUTHORS index a271a5e5,bf785f69..81378c23 --- a/AUTHORS +++ b/AUTHORS @@@ -57,18 -57,17 +57,21 @@@ Andreas Henriksson + - sysevent plugin. - connectivity plugin. Andy Parkins - battery plugin: sysfs code. + Aneesh Puttur + - connectivity plugin. + Andy Smith - AMQP 1.0 plugin. - + +Aneesh Puttur + - connectivity plugin. + Anthony Dewhurst - zfs_arc plugin. @@@ -179,9 -178,6 +182,9 @@@ Jiri Tyr - Lua plugin. +Shirly Radco + - write_syslog plugin. + Kevin Bowling - write_tsdb plugin for http://opentsdb.net/ diff --combined configure.ac index d05cc80c,2daa7d59..141a8da2 --- a/configure.ac +++ b/configure.ac @@@ -165,7 -165,6 +165,7 @@@ AC_CHECK_HEADERS_ONCE([ kstat.h \ kvm.h \ libgen.h \ + locale.h \ mntent.h \ mnttab.h \ netdb.h \ @@@ -636,6 -635,16 +636,6 @@@ f # }}} -# For the dns plugin -AC_CHECK_HEADERS([arpa/nameser.h]) -AC_CHECK_HEADERS([arpa/nameser_compat.h], [], [], - [[ - #if HAVE_ARPA_NAMESER_H - # include - #endif - ]] -) - AC_CHECK_HEADERS([net/if_arp.h], [], [], [[ #if HAVE_SYS_SOCKET_H @@@ -743,21 -752,33 +743,21 @@@ test_cxx_flags() # AC_CHECK_FUNCS_ONCE([ \ asprintf \ - closelog \ - getaddrinfo \ - getgrnam_r \ - getnameinfo \ getpwnam \ getpwnam_r \ - gettimeofday \ if_indextoname \ - openlog \ - regcomp \ - regerror \ - regexec \ - regfree \ - select \ setenv \ setgroups \ - strcasecmp \ - strdup \ - strncasecmp \ - sysconf + setlocale ] ) AC_FUNC_STRERROR_R -SAVE_CFLAGS="$CFLAGS" -CFLAGS="-Wall -Werror" +if test "x$GCC" = "xyes"; then + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Wall -Werror" +fi SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="" if test "x$ac_system" = "xWindows"; then @@@ -1562,7 -1583,7 +1562,7 @@@ if test "x$have_getmntent" = "xlibc"; t AC_COMPILE_IFELSE( [ AC_LANG_PROGRAM( - [[#include "$srcdir/src/utils_mount.h"]], + [[#include "$srcdir/src/utils/mount/mount.h"]], [[ FILE *fh; struct mntent *me; @@@ -1584,7 -1605,7 +1584,7 @@@ AC_COMPILE_IFELSE( [ AC_LANG_PROGRAM( - [[#include "$srcdir/src/utils_mount.h"]], + [[#include "$srcdir/src/utils/mount/mount.h"]], [[ FILE *fh; struct mnttab mt; @@@ -2054,39 -2075,52 +2054,39 @@@ if test "x$with_kvm_openfiles" = "xyes" fi # --with-cuda {{{ -# only CUDA provides the nvml.h header AC_ARG_WITH([cuda], [AS_HELP_STRING([--with-cuda@<:@=PREFIX@:>@], [Path to cuda.])], [ - if test "x$withval" = "xyes"; then + if test "x$withval" != "xno" && test "x$withval" != "xyes"; then + with_cuda_cppflags="-I$withval/include" + with_cuda_ldflags="-I$withval/lib" with_cuda="yes" - else if test "x$withval" = "xno"; then - with_cuda="no" else - with_cuda="yes" - CUDA_CFLAGS="$CUDA_CFLAGS -I$withval/include" - CUDA_LDFLAGS="$CUDA_LDFLAGS -L$withval/lib" - fi; fi + with_cuda="$withval" + fi ], - [ with_cuda="yes" - CUDA_CFLAGS="$CUDA_CFLAGS -I/opt/cuda/include" - CUDA_LDFLAGS="$CUDA_LDFLAGS -L/opt/cuda/lib64" - ] + [with_cuda="no"] ) -SAVE_CFLAGS="$CFLAGS" -SAVE_LDFLAGS="$LDFLAGS" -CFLAGS="$CFLAGS $CUDA_CFLAGS" -LDFLAGS="$LDFLAGS $CUDA_LDFLAGS" - if test "x$with_cuda" = "xyes"; then + SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $with_cuda_cppflags" + AC_CHECK_HEADERS([nvml.h], [with_cuda="yes"], - [with_cuda="no (header file missing)"] + [with_cuda="no (nvml.h not found)"] ) -fi -if test "x$with_cuda" = "xpkgconfig"; then - AC_CHECK_HEADERS([nvml.h], - [], - [with_cuda="no (header file missing)"] - ) + CPPFLAGS="$SAVE_CPPFLAGS" fi if test "x$with_cuda" = "xyes"; then - BUILD_WITH_CUDA_CFLAGS="$CUDA_CFLAGS" + BUILD_WITH_CUDA_CPPFLAGS="$CUDA_CPPFLAGS" BUILD_WITH_CUDA_LDFLAGS="$CUDA_LDFLAGS" BUILD_WITH_CUDA_LIBS="-lnvidia-ml" fi -AC_SUBST([BUILD_WITH_CUDA_CFLAGS]) +AC_SUBST([BUILD_WITH_CUDA_CPPFLAGS]) AC_SUBST([BUILD_WITH_CUDA_LDFLAGS]) AC_SUBST([BUILD_WITH_CUDA_LIBS]) @@@ -2115,6 -2149,9 +2115,6 @@@ CPPFLAGS="$CPPFLAGS $LIBAQUAERO5_CFLAGS LDFLAGS="$LDFLAGS $LIBAQUAERO5_LDFLAGS" if test "x$with_libaquaero5" = "xyes"; then - if test "x$LIBAQUAERO5_CFLAGS" != "x"; then - AC_MSG_NOTICE([libaquaero5 CPPFLAGS: $LIBAQUAERO5_CFLAGS]) - fi AC_CHECK_HEADERS([libaquaero5.h], [with_libaquaero5="yes"], [with_libaquaero5="no (libaquaero5.h not found)"] @@@ -2122,6 -2159,9 +2122,6 @@@ fi if test "x$with_libaquaero5" = "xyes"; then - if test "x$LIBAQUAERO5_LDFLAGS" != "x"; then - AC_MSG_NOTICE([libaquaero5 LDFLAGS: $LIBAQUAERO5_LDFLAGS]) - fi AC_CHECK_LIB([aquaero5], libaquaero5_poll, [with_libaquaero5="yes"], [with_libaquaero5="no (symbol 'libaquaero5_poll' not found)"] @@@ -2162,6 -2202,9 +2162,6 @@@ CPPFLAGS="$CPPFLAGS $LIBHIREDIS_CPPFLAG LDFLAGS="$LDFLAGS $LIBHIREDIS_LDFLAGS" if test "x$with_libhiredis" = "xyes"; then - if test "x$LIBHIREDIS_CPPFLAGS" != "x"; then - AC_MSG_NOTICE([libhiredis CPPFLAGS: $LIBHIREDIS_CPPFLAGS]) - fi AC_CHECK_HEADERS([hiredis/hiredis.h], [with_libhiredis="yes"], [with_libhiredis="no (hiredis.h not found)"] @@@ -2169,6 -2212,9 +2169,6 @@@ fi if test "x$with_libhiredis" = "xyes"; then - if test "x$LIBHIREDIS_LDFLAGS" != "x"; then - AC_MSG_NOTICE([libhiredis LDFLAGS: $LIBHIREDIS_LDFLAGS]) - fi AC_CHECK_LIB([hiredis], [redisCommand], [with_libhiredis="yes"], [with_libhiredis="no (symbol 'redisCommand' not found)"] @@@ -2419,30 -2465,13 +2419,30 @@@ if test "x$with_libdpdk" != "xno"; the fi if test "x$with_libdpdk" = "xyes"; then + SAVE_LIBS="$LIBS" + LIBS="$LIBDPDK_LIBS $LIBS" SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$LIBDPDK_LDFLAGS $LDFLAGS" - AC_CHECK_LIB([dpdk], [rte_eal_init], + SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$LIBDPDK_CPPFLAGS $CPPFLAGS" + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$LIBDPDK_CFLAGS $CFLAGS" + AC_LINK_IFELSE( + [ + AC_LANG_PROGRAM( + [[ + #include + ]], + [[return rte_eal_init(0, NULL);]] + ) + ], [with_libdpdk="yes"], [with_libdpdk="no (symbol 'rte_eal_init' not found)"] ) + LIBS="$SAVE_LIBS" LDFLAGS="$SAVE_LDFLAGS" + CPPFLAGS="$SAVE_CPPFLAGS" + CFLAGS="$SAVE_CFLAGS" fi # }}} @@@ -2606,6 -2635,9 +2606,6 @@@ LDFLAGS="$LDFLAGS $GCRYPT_LDFLAGS LIBS="$LIBS $GCRYPT_LIBS" if test "x$with_libgcrypt" = "xyes"; then - if test "x$GCRYPT_CPPFLAGS" != "x"; then - AC_MSG_NOTICE([gcrypt CPPFLAGS: $GCRYPT_CPPFLAGS]) - fi AC_CHECK_HEADERS([gcrypt.h], [with_libgcrypt="yes"], [with_libgcrypt="no (gcrypt.h not found)"] @@@ -2942,6 -2974,18 +2942,6 @@@ if test "x$with_java" = "xyes"; the fi; fi fi -if test "x$JAVA_CPPFLAGS" != "x"; then - AC_MSG_NOTICE([Building with JAVA_CPPFLAGS set to: $JAVA_CPPFLAGS]) -fi -if test "x$JAVA_CFLAGS" != "x"; then - AC_MSG_NOTICE([Building with JAVA_CFLAGS set to: $JAVA_CFLAGS]) -fi -if test "x$JAVA_LDFLAGS" != "x"; then - AC_MSG_NOTICE([Building with JAVA_LDFLAGS set to: $JAVA_LDFLAGS]) -fi -if test "x$JAVA_LIBS" != "x"; then - AC_MSG_NOTICE([Building with JAVA_LIBS set to: $JAVA_LIBS]) -fi if test "x$JAVAC" = "x"; then with_javac_path="$PATH" if test "x$with_java_home" != "x"; then @@@ -2999,6 -3043,7 +2999,6 @@@ f if test "x$with_java" = "xyes"; then JAVA_LIBS="$JAVA_LIBS -ljvm" - AC_MSG_NOTICE([Building with JAVA_LIBS set to: $JAVA_LIBS]) fi CPPFLAGS="$SAVE_CPPFLAGS" @@@ -3038,6 -3083,10 +3038,6 @@@ CPPFLAGS="$CPPFLAGS $LIBLDAP_CPPFLAGS LDFLAGS="$LDFLAGS $LIBLDAP_LDFLAGS" if test "x$with_libldap" = "xyes"; then - if test "x$LIBLDAP_CPPFLAGS" != "x"; then - AC_MSG_NOTICE([libldap CPPFLAGS: $LIBLDAP_CPPFLAGS]) - fi - AC_CHECK_HEADERS([ldap.h], [with_libldap="yes"], [with_libldap="no ('ldap.h' not found)"] @@@ -3045,6 -3094,10 +3045,6 @@@ fi if test "x$with_libldap" = "xyes"; then - if test "x$LIBLDAP_LDFLAGS" != "x"; then - AC_MSG_NOTICE([libldap LDFLAGS: $LIBLDAP_LDFLAGS]) - fi - AC_CHECK_LIB([ldap], [ldap_initialize], [with_libldap="yes"], [with_libldap="no (symbol 'ldap_initialize' not found)"] @@@ -3352,6 -3405,7 +3352,6 @@@ AC_ARG_WITH([libmodbus] # configure using pkg-config if test "x$with_libmodbus" = "xuse_pkgconfig"; then - AC_MSG_NOTICE([Checking for libmodbus using $PKG_CONFIG]) $PKG_CONFIG --exists 'libmodbus' 2>/dev/null if test $? -ne 0; then with_libmodbus="no (pkg-config doesn't know libmodbus)" @@@ -3434,6 -3488,10 +3434,6 @@@ if test "x$with_libmongoc" = "xyes"; th CPPFLAGS="$CPPFLAGS $LIBMONGOC_CFLAGS" - if test "x$CPPFLAGS" != "x"; then - AC_MSG_NOTICE([libmongoc CPPFLAGS: $LIBMONGOC_CFLAGS]) - fi - AC_CHECK_HEADERS([mongoc.h], [with_libmongoc="yes"], [with_libmongoc="no ('mongoc.h' not found)"] @@@ -3449,6 -3507,10 +3449,6 @@@ if test "x$with_libmongoc" = "xyes"; th CPPFLAGS="$CPPFLAGS $LIBMONGOC_CFLAGS" LDFLAGS="$LDFLAGS $LIBMONGOC_LDFLAGS" - if test "x$LIBMONGOC_LDFLAGS" != "x"; then - AC_MSG_NOTICE([libmongoc LDFLAGS: $LIBMONGOC_LDFLAGS]) - fi - AC_CHECK_LIB([mongoc-1.0], [mongoc_init], [with_libmongoc="yes"], [with_libmongoc="no (symbol 'mongoc_init' not found)"] @@@ -3461,12 -3523,10 +3461,12 @@@ f if test "x$with_libmongoc" = "xyes"; then BUILD_WITH_LIBMONGOC_CFLAGS="$LIBMONGOC_CFLAGS" BUILD_WITH_LIBMONGOC_LDFLAGS="$LIBMONGOC_LDFLAGS" + BUILD_WITH_LIBMONGOC_LIBS="$LIBMONGOC_LIBS" fi AC_SUBST([BUILD_WITH_LIBMONGOC_CFLAGS]) AC_SUBST([BUILD_WITH_LIBMONGOC_LDFLAGS]) +AC_SUBST([BUILD_WITH_LIBMONGOC_LIBS]) # }}} # --with-libmosquitto {{{ @@@ -3752,6 -3812,9 +3752,6 @@@ CPPFLAGS="$CPPFLAGS $LIBNETAPP_CPPFLAGS LDFLAGS="$LDFLAGS $LIBNETAPP_LDFLAGS" if test "x$with_libnetapp" = "xyes"; then - if test "x$LIBNETAPP_CPPFLAGS" != "x"; then - AC_MSG_NOTICE([netapp CPPFLAGS: $LIBNETAPP_CPPFLAGS]) - fi AC_CHECK_HEADERS([netapp_api.h], [with_libnetapp="yes"], [with_libnetapp="no (netapp_api.h not found)"] @@@ -3759,10 -3822,16 +3759,10 @@@ fi if test "x$with_libnetapp" = "xyes"; then - if test "x$LIBNETAPP_LDFLAGS" != "x"; then - AC_MSG_NOTICE([netapp LDFLAGS: $LIBNETAPP_LDFLAGS]) - fi - if test "x$LIBNETAPP_LIBS" = "x"; then LIBNETAPP_LIBS="$PTHREAD_LIBS -lxml -ladt -lssl -lm -lcrypto -lz" fi - AC_MSG_NOTICE([netapp LIBS: $LIBNETAPP_LIBS]) - AC_CHECK_LIB([netapp], [na_server_invoke_elem], [with_libnetapp="yes"], [with_libnetapp="no (symbol na_server_invoke_elem not found)"], @@@ -3847,10 -3916,7 +3847,10 @@@ if test "x$with_libnetsnmp" = "xyes"; t SAVE_CPPFLAGS="$CPPFLAGS" SAVE_LDFLAGS="$LDFLAGS" SAVE_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $with_libnetsnmp_cppflags -Wall -Werror" + CPPFLAGS="$CPPFLAGS $with_libnetsnmp_cppflags" + if test "x$GCC" = "xyes"; then + CPPFLAGS="$CPPFLAGS -Wall -Werror" + fi LDFLAGS="$LDFLAGS $with_libnetsnmp_ldflags" LIBS="$LIBS -lnetsnmp" @@@ -3950,13 -4016,7 +3950,13 @@@ if test "x$with_libnetsnmpagent" = "xye ) AC_CHECK_LIB([netsnmpagent], [init_agent], - [with_libnetsnmpagent="yes"], + [ + # libnetsnmp can be built without mib loading support + AC_CHECK_LIB([netsnmp], [get_tree], + [with_libnetsnmpagent="yes"], + [with_libnetsnmpagent="no (libnetsnmp doesn't support mib loading)"] + ) + ], [with_libnetsnmpagent="no (libnetsnmpagent not found)"], [$libnetsnmphelpers] ) @@@ -3965,8 -4025,6 +3965,8 @@@ fi if test "x$with_libnetsnmpagent" = "xyes"; then + BUILD_WITH_LIBNETSNMPAGENT_CPPFLAGS="$with_libnetsnmpagent_cppflags" + BUILD_WITH_LIBNETSNMPAGENT_LDFLAGS="$with_libnetsnmpagent_ldflags" BUILD_WITH_LIBNETSNMPAGENT_LIBS="-lnetsnmpagent $libnetsnmphelpers" fi @@@ -4321,10 -4379,7 +4321,10 @@@ if test "x$with_libperl" = "xyes"; the # (see issues #41 and #42) SAVE_CFLAGS="$CFLAGS" SAVE_LIBS="$LIBS" - CFLAGS="$CFLAGS $PERL_CFLAGS -Wall -Werror" + CFLAGS="$CFLAGS $PERL_CFLAGS" + if test "x$GCC" = "xyes"; then + CFLAGS="$CFLAGS -Wall -Werror" + fi LIBS="$LIBS $PERL_LIBS" AC_CACHE_CHECK([for broken Perl_load_module()], @@@ -4764,7 -4819,7 +4764,7 @@@ if test "$PYTHON_CONFIG" != ""; the if test $? -ne 0; then with_libpython="no" fi - LIBPYTHON_LIBS="`${PYTHON_CONFIG} --libs`" + LIBPYTHON_LIBS="`${PYTHON_CONFIG} --libs --embed`" || LIBPYTHON_LIBS="`${PYTHON_CONFIG} --libs`" if test $? -ne 0; then with_libpython="no" fi @@@ -5213,27 -5268,6 +5213,27 @@@ if test "x$with_libsensors" = "xyes"; t fi if test "x$with_libsensors" = "xyes"; then + SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $with_sensors_cppflags" + AC_PREPROC_IFELSE( + [ + AC_LANG_SOURCE( + [[ + #include + #if SENSORS_API_VERSION < 0x400 + #error "required libsensors version >= 3.0" + #endif + ]] + ) + ], + [with_libsensors="yes"], + [with_libsensors="no (sensors library version 3.0.0 or higher is required)"] + ) + + CPPFLAGS="$SAVE_CPPFLAGS" +fi + +if test "x$with_libsensors" = "xyes"; then BUILD_WITH_LIBSENSORS_CPPFLAGS="$with_sensors_cppflags" BUILD_WITH_LIBSENSORS_LDFLAGS="$with_sensors_ldflags" BUILD_WITH_LIBSENSORS_LIBS="-lsensors" @@@ -5602,6 -5636,7 +5602,6 @@@ f # configure using pkg-config if test "x$with_libupsclient" = "xuse_pkgconfig"; then - AC_MSG_NOTICE([Checking for libupsclient using $PKG_CONFIG]) $PKG_CONFIG --exists 'libupsclient' 2>/dev/null if test $? -ne 0; then with_libupsclient="no (pkg-config doesn't know libupsclient)" @@@ -5762,7 -5797,7 +5762,7 @@@ if test "x$with_libxmms" = "xyes"; the fi if test "x$with_libxmms" = "xyes"; then - SAVE_CPPFLAGS="$CFLAGS" + SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$with_xmms_cflags" AC_CHECK_HEADER([xmmsctrl.h], @@@ -6409,7 -6444,6 +6409,7 @@@ plugin_serial="no plugin_smart="no" plugin_swap="no" plugin_synproxy="no" +plugin_sysevent="no" plugin_tape="no" plugin_tcpconns="no" plugin_ted="no" @@@ -6517,7 -6551,6 +6517,7 @@@ f # FreeBSD if test "x$ac_system" = "xFreeBSD"; then + plugin_cpufreq="yes" plugin_disk="yes" plugin_zfs_arc="yes" fi @@@ -6596,7 -6629,6 +6596,7 @@@ f if test "x$with_libyajl" = "xyes"; then plugin_ceph="yes" + plugin_sysevent="yes" fi if test "x$have_processor_info" = "xyes"; then @@@ -6631,7 -6663,7 +6631,7 @@@ if test "x$c_cv_have_one_getmntent" = " plugin_df="yes" fi -if test "x$c_cv_have_getmntent_r" = "xyes"; then +if test "x$have_getmntent_r" = "xyes"; then plugin_df="yes" fi @@@ -6793,7 -6825,7 +6793,7 @@@ AC_PLUGIN([bind], [$plug AC_PLUGIN([ceph], [$plugin_ceph], [Ceph daemon statistics]) AC_PLUGIN([cgroups], [$plugin_cgroups], [CGroups CPU usage accounting]) AC_PLUGIN([chrony], [yes], [Chrony statistics]) - AC_PLUGIN([connectivity], [$with_libmnl], [Network interface up/down statistics]) + AC_PLUGIN([connectivity], [$plugin_connectivity], [Network interface up/down events]) AC_PLUGIN([conntrack], [$plugin_conntrack], [nf_conntrack statistics]) AC_PLUGIN([contextswitch], [$plugin_contextswitch], [context switch statistics]) AC_PLUGIN([cpu], [$plugin_cpu], [CPU usage statistics]) @@@ -6897,7 -6929,6 +6897,7 @@@ AC_PLUGIN([snmp_agent], [$with AC_PLUGIN([statsd], [yes], [StatsD plugin]) AC_PLUGIN([swap], [$plugin_swap], [Swap usage statistics]) AC_PLUGIN([synproxy], [$plugin_synproxy], [Synproxy stats plugin]) +AC_PLUGIN([sysevent], [$plugin_sysevent], [rsyslog events]) AC_PLUGIN([syslog], [$have_syslog], [Syslog logging plugin]) AC_PLUGIN([table], [yes], [Parsing of tabular data]) AC_PLUGIN([tail], [yes], [Parsing of logfiles]) @@@ -6926,6 -6957,7 +6926,6 @@@ AC_PLUGIN([vserver], [$plug AC_PLUGIN([wireless], [$plugin_wireless], [Wireless statistics]) AC_PLUGIN([write_graphite], [yes], [Graphite / Carbon output plugin]) AC_PLUGIN([write_http], [$with_libcurl], [HTTP output plugin]) -AC_PLUGIN([write_stackdriver], [$plugin_write_stackdriver], [Google Stackdriver Monitoring output plugin]) AC_PLUGIN([write_kafka], [$with_librdkafka], [Kafka output plugin]) AC_PLUGIN([write_log], [yes], [Log output plugin]) AC_PLUGIN([write_mongodb], [$with_libmongoc], [MongoDB output plugin]) @@@ -6933,8 -6965,6 +6933,8 @@@ AC_PLUGIN([write_prometheus], [$plug AC_PLUGIN([write_redis], [$with_libhiredis], [Redis output plugin]) AC_PLUGIN([write_riemann], [$with_libriemann_client], [Riemann output plugin]) AC_PLUGIN([write_sensu], [yes], [Sensu output plugin]) +AC_PLUGIN([write_stackdriver], [$plugin_write_stackdriver], [Google Stackdriver Monitoring output plugin]) +AC_PLUGIN([write_syslog], [yes], [Syslog output plugin]) AC_PLUGIN([write_tsdb], [yes], [TSDB output plugin]) AC_PLUGIN([xencpu], [$plugin_xencpu], [Xen Host CPU usage]) AC_PLUGIN([xmms], [$with_libxmms], [XMMS statistics]) @@@ -7078,13 -7108,11 +7078,13 @@@ AC_SUBST([LCC_VERSION_STRING] AC_CONFIG_FILES([src/libcollectdclient/collectd/lcc_features.h]) -AM_CFLAGS="-Wall" -AM_CXXFLAGS="-Wall" -if test "x$enable_werror" != "xno"; then - AM_CFLAGS="$AM_CFLAGS -Werror" - AM_CXXFLAGS="$AM_CXXFLAGS -Werror" +if test "x$GCC" = "xyes"; then + AM_CFLAGS="-Wall" + AM_CXXFLAGS="-Wall" + if test "x$enable_werror" != "xno"; then + AM_CFLAGS="$AM_CFLAGS -Werror" + AM_CXXFLAGS="$AM_CXXFLAGS -Werror" + fi fi AC_SUBST([AM_CFLAGS]) @@@ -7134,6 -7162,7 +7134,6 @@@ AC_MSG_RESULT([ YACC . . . . . . . AC_MSG_RESULT([ YFLAGS . . . . . . . $YFLAGS]) AC_MSG_RESULT() AC_MSG_RESULT([ Libraries:]) -AC_MSG_RESULT([ cuda . . . . . . . . $with_cuda]) AC_MSG_RESULT([ intel mic . . . . . . $with_mic]) AC_MSG_RESULT([ libaquaero5 . . . . . $with_libaquaero5]) AC_MSG_RESULT([ libatasmart . . . . . $with_libatasmart]) @@@ -7167,7 -7196,6 +7167,7 @@@ AC_MSG_RESULT([ libnetapp . . . . . AC_MSG_RESULT([ libnetsnmp . . . . . $with_libnetsnmp]) AC_MSG_RESULT([ libnetsnmpagent . . . $with_libnetsnmpagent]) AC_MSG_RESULT([ libnotify . . . . . . $with_libnotify]) +AC_MSG_RESULT([ libnvidia-ml . . . . $with_cuda]) AC_MSG_RESULT([ libopenipmi . . . . . $with_libopenipmipthread]) AC_MSG_RESULT([ liboping . . . . . . $with_liboping]) AC_MSG_RESULT([ libowcapi . . . . . . $with_libowcapi]) @@@ -7327,7 -7355,6 +7327,7 @@@ AC_MSG_RESULT([ snmp_agent . . . . AC_MSG_RESULT([ statsd . . . . . . . $enable_statsd]) AC_MSG_RESULT([ swap . . . . . . . . $enable_swap]) AC_MSG_RESULT([ synproxy . . . . . . $enable_synproxy]) +AC_MSG_RESULT([ sysevent. . . . . . . $enable_sysevent]) AC_MSG_RESULT([ syslog . . . . . . . $enable_syslog]) AC_MSG_RESULT([ table . . . . . . . . $enable_table]) AC_MSG_RESULT([ tail_csv . . . . . . $enable_tail_csv]) @@@ -7364,7 -7391,6 +7364,7 @@@ AC_MSG_RESULT([ write_redis . . . . AC_MSG_RESULT([ write_riemann . . . . $enable_write_riemann]) AC_MSG_RESULT([ write_sensu . . . . . $enable_write_sensu]) AC_MSG_RESULT([ write_stackdriver . . $enable_write_stackdriver]) +AC_MSG_RESULT([ write_syslog . . . . $enable_write_syslog]) AC_MSG_RESULT([ write_tsdb . . . . . $enable_write_tsdb]) AC_MSG_RESULT([ xencpu . . . . . . . $enable_xencpu]) AC_MSG_RESULT([ xmms . . . . . . . . $enable_xmms])