X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=b2dcabf889a2faad141d38ca5b420eb1e158b9dc;hb=3542cbfc6ef7cfd4b73ba13397fee38b2eb295f5;hp=cadbb24935fc8256ac60af215fb844cd75ab1007;hpb=711f5b6c86f51061c21bedcaa46214a01de0125c;p=collectd.git diff --git a/configure.ac b/configure.ac index cadbb249..b2dcabf8 100644 --- a/configure.ac +++ b/configure.ac @@ -777,8 +777,10 @@ AC_CHECK_FUNCS_ONCE([ \ 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 @@ -1583,7 +1585,7 @@ if test "x$have_getmntent" = "xlibc"; then AC_COMPILE_IFELSE( [ AC_LANG_PROGRAM( - [[#include "$srcdir/src/utils_mount.h"]], + [[#include "$srcdir/src/utils/mount/mount.h"]], [[ FILE *fh; struct mntent *me; @@ -1605,7 +1607,7 @@ if test "x$have_getmntent" = "xlibc"; then AC_COMPILE_IFELSE( [ AC_LANG_PROGRAM( - [[#include "$srcdir/src/utils_mount.h"]], + [[#include "$srcdir/src/utils/mount/mount.h"]], [[ FILE *fh; struct mnttab mt; @@ -2136,9 +2138,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)"] @@ -2146,9 +2145,6 @@ if test "x$with_libaquaero5" = "xyes"; then 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)"] @@ -2189,9 +2185,6 @@ CPPFLAGS="$CPPFLAGS $LIBHIREDIS_CPPFLAGS" 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)"] @@ -2199,9 +2192,6 @@ if test "x$with_libhiredis" = "xyes"; then 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)"] @@ -2639,9 +2629,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)"] @@ -2978,18 +2965,6 @@ if test "x$with_java" = "xyes"; then 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 @@ -3047,7 +3022,6 @@ fi 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" @@ -3087,10 +3061,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)"] @@ -3098,10 +3068,6 @@ if test "x$with_libldap" = "xyes"; then 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)"] @@ -3409,7 +3375,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)" @@ -3492,10 +3457,6 @@ if test "x$with_libmongoc" = "xyes"; then 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)"] @@ -3511,10 +3472,6 @@ if test "x$with_libmongoc" = "xyes"; then 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)"] @@ -3818,9 +3775,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)"] @@ -3828,16 +3782,10 @@ if test "x$with_libnetapp" = "xyes"; then 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)"], @@ -3922,7 +3870,10 @@ if test "x$with_libnetsnmp" = "xyes"; then 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" @@ -4385,7 +4336,10 @@ if test "x$with_libperl" = "xyes"; then # (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()], @@ -4825,7 +4779,7 @@ if test "$PYTHON_CONFIG" != ""; then 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 @@ -5663,7 +5617,6 @@ fi # 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)" @@ -6573,6 +6526,7 @@ fi # FreeBSD if test "x$ac_system" = "xFreeBSD"; then + plugin_cpufreq="yes" plugin_disk="yes" plugin_zfs_arc="yes" fi @@ -6685,7 +6639,7 @@ if test "x$c_cv_have_one_getmntent" = "xyes"; then 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 @@ -6978,7 +6932,6 @@ AC_PLUGIN([vserver], [$plugin_vserver], [Linux VServer sta 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]) @@ -6986,6 +6939,8 @@ AC_PLUGIN([write_prometheus], [$plugin_write_prometheus], [Prometheus write 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]) @@ -7129,11 +7084,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]) @@ -7411,6 +7368,7 @@ AC_MSG_RESULT([ write_redis . . . . . $enable_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])