From: Ruben Kerkhof Date: Fri, 11 Dec 2015 20:36:31 +0000 (+0100) Subject: Merge pull request #1452 from rubenk/configure-silence-configure-check X-Git-Tag: collectd-5.6.0~502 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=afb4cca6aac53445d5c34fd0935ce30f95737920;hp=a076f79da5f22c082f7e07b28f5978ce27c673ed;p=collectd.git Merge pull request #1452 from rubenk/configure-silence-configure-check configure.ac: send output of check to /dev/null --- diff --git a/configure.ac b/configure.ac index 8b150dce..7f24978a 100644 --- a/configure.ac +++ b/configure.ac @@ -3235,13 +3235,13 @@ fi # --with-libowcapi {{{ with_libowcapi_cppflags="" -with_libowcapi_libs="-lowcapi" +with_libowcapi_ldflags="" AC_ARG_WITH(libowcapi, [AS_HELP_STRING([--with-libowcapi@<:@=PREFIX@:>@], [Path to libowcapi.])], [ if test "x$withval" != "xno" && test "x$withval" != "xyes" then with_libowcapi_cppflags="-I$withval/include" - with_libowcapi_libs="-L$withval/lib -lowcapi" + with_libowcapi_ldflags="-L$withval/lib" with_libowcapi="yes" else with_libowcapi="$withval" @@ -3253,7 +3253,7 @@ AC_ARG_WITH(libowcapi, [AS_HELP_STRING([--with-libowcapi@<:@=PREFIX@:>@], [Path if test "x$with_libowcapi" = "xyes" then SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$with_libowcapi_cppflags" + CPPFLAGS="$CPPFLAGS $with_libowcapi_cppflags" AC_CHECK_HEADERS(owcapi.h, [with_libowcapi="yes"], [with_libowcapi="no (owcapi.h not found)"]) @@ -3263,7 +3263,7 @@ if test "x$with_libowcapi" = "xyes" then SAVE_LDFLAGS="$LDFLAGS" SAVE_CPPFLAGS="$CPPFLAGS" - LDFLAGS="$with_libowcapi_libs" + LDFLAGS="$LDFLAGS $with_libowcapi_ldflags" CPPFLAGS="$with_libowcapi_cppflags" AC_CHECK_LIB(owcapi, OW_get, [with_libowcapi="yes"], [with_libowcapi="no (libowcapi not found)"]) @@ -3274,8 +3274,10 @@ fi if test "x$with_libowcapi" = "xyes" then BUILD_WITH_LIBOWCAPI_CPPFLAGS="$with_libowcapi_cppflags" - BUILD_WITH_LIBOWCAPI_LIBS="$with_libowcapi_libs" + BUILD_WITH_LIBOWCAPI_LDFLAGS="$with_libowcapi_ldflags" + BUILD_WITH_LIBOWCAPI_LIBS="-lowcapi" AC_SUBST(BUILD_WITH_LIBOWCAPI_CPPFLAGS) + AC_SUBST(BUILD_WITH_LIBOWCAPI_LDFLAGS) AC_SUBST(BUILD_WITH_LIBOWCAPI_LIBS) fi # }}} diff --git a/src/Makefile.am b/src/Makefile.am index 9c1e32fb..1996bed6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -784,7 +784,7 @@ onewire_la_SOURCES = onewire.c onewire_la_CFLAGS = $(AM_CFLAGS) onewire_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBOWCAPI_CPPFLAGS) onewire_la_LIBADD = $(BUILD_WITH_LIBOWCAPI_LIBS) -onewire_la_LDFLAGS = $(PLUGIN_LDFLAGS) +onewire_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBOWCAPI_LDFLAGS) endif if BUILD_PLUGIN_OPENLDAP diff --git a/src/daemon/common_test.c b/src/daemon/common_test.c index 399f8b53..ca8f15a3 100644 --- a/src/daemon/common_test.c +++ b/src/daemon/common_test.c @@ -24,8 +24,8 @@ * Florian octo Forster */ -#include "testing.h" #include "common.h" +#include "testing.h" #if HAVE_LIBKSTAT kstat_ctl_t *kc; diff --git a/src/daemon/meta_data_test.c b/src/daemon/meta_data_test.c index b4c0e276..48760d64 100644 --- a/src/daemon/meta_data_test.c +++ b/src/daemon/meta_data_test.c @@ -24,9 +24,9 @@ * Florian octo Forster */ -#include "testing.h" -#include "collectd.h" #include "common.h" /* for STATIC_ARRAY_SIZE */ +#include "collectd.h" +#include "testing.h" #include "meta_data.h" DEF_TEST(base) diff --git a/src/daemon/utils_avltree_test.c b/src/daemon/utils_avltree_test.c index 6dbafe18..489d60fa 100644 --- a/src/daemon/utils_avltree_test.c +++ b/src/daemon/utils_avltree_test.c @@ -24,10 +24,10 @@ * Florian octo Forster */ -#include "testing.h" +#include "common.h" /* STATIC_ARRAY_SIZE */ #include "collectd.h" +#include "testing.h" #include "utils_avltree.h" -#include "common.h" /* STATIC_ARRAY_SIZE */ static int compare_total_count = 0; #define RESET_COUNTS() do { compare_total_count = 0; } while (0) diff --git a/src/daemon/utils_heap_test.c b/src/daemon/utils_heap_test.c index 53d0fba8..6ef80475 100644 --- a/src/daemon/utils_heap_test.c +++ b/src/daemon/utils_heap_test.c @@ -24,8 +24,8 @@ * Florian octo Forster */ -#include "testing.h" #include "collectd.h" +#include "testing.h" #include "utils_heap.h" static int compare (void const *v0, void const *v1) diff --git a/src/daemon/utils_subst_test.c b/src/daemon/utils_subst_test.c index c12aa105..ec2e3514 100644 --- a/src/daemon/utils_subst_test.c +++ b/src/daemon/utils_subst_test.c @@ -24,9 +24,9 @@ * Florian octo Forster */ -#include "testing.h" -#include "collectd.h" #include "common.h" /* for STATIC_ARRAY_SIZE */ +#include "collectd.h" +#include "testing.h" #include "utils_subst.h" #if HAVE_LIBKSTAT diff --git a/src/daemon/utils_time_test.c b/src/daemon/utils_time_test.c index 255286f4..4d64991b 100644 --- a/src/daemon/utils_time_test.c +++ b/src/daemon/utils_time_test.c @@ -26,8 +26,8 @@ #define DBL_PRECISION 1e-3 -#include "testing.h" #include "collectd.h" +#include "testing.h" #include "utils_time.h" DEF_TEST(conversion) diff --git a/src/utils_latency_test.c b/src/utils_latency_test.c index 5769ec95..f275813d 100644 --- a/src/utils_latency_test.c +++ b/src/utils_latency_test.c @@ -26,9 +26,9 @@ #define DBL_PRECISION 1e-9 -#include "testing.h" -#include "collectd.h" #include "common.h" /* for STATIC_ARRAY_SIZE */ +#include "collectd.h" +#include "testing.h" #include "utils_time.h" #include "utils_latency.h" diff --git a/src/utils_mount_test.c b/src/utils_mount_test.c index b4cb4321..d9d685ae 100644 --- a/src/utils_mount_test.c +++ b/src/utils_mount_test.c @@ -24,8 +24,8 @@ * Florian octo Forster */ -#include "testing.h" #include "collectd.h" +#include "testing.h" #include "utils_mount.h" #if HAVE_LIBKSTAT diff --git a/src/utils_vl_lookup_test.c b/src/utils_vl_lookup_test.c index 41cc0a41..6d23c8c5 100644 --- a/src/utils_vl_lookup_test.c +++ b/src/utils_vl_lookup_test.c @@ -24,8 +24,8 @@ * Florian Forster **/ -#include "testing.h" #include "collectd.h" +#include "testing.h" #include "utils_vl_lookup.h" static _Bool expect_new_obj = 0;