From: Florian Forster Date: Tue, 29 Apr 2008 15:43:19 +0000 (+0200) Subject: Merge branch 'collectd-4.2' of git://git.verplant.org/collectd into collectd-4.2 X-Git-Tag: collectd-4.4.0~4^2~6^2 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=d8a27138e0fc455088443ca034942a00c3b4eecd;hp=-c;p=collectd.git Merge branch 'collectd-4.2' of git://git.verplant.org/collectd into collectd-4.2 --- d8a27138e0fc455088443ca034942a00c3b4eecd diff --combined configure.in index cdd3e6cb,046b174f..b5138a26 --- a/configure.in +++ b/configure.in @@@ -28,7 -28,6 +28,7 @@@ AC_LIBTOOL_DLOPE AC_PROG_LIBTOOL AC_PROG_LEX AC_PROG_YACC +PKG_PROG_PKG_CONFIG AC_CONFIG_SUBDIRS(libltdl) AC_MSG_CHECKING([for kernel type ($host_os)]) @@@ -372,6 -371,68 +372,68 @@@ AC_CHECK_FUNCS(gettimeofday select strd AC_FUNC_STRERROR_R + AC_CACHE_CHECK([for strtok_r], + [have_strtok_r_default], + AC_LINK_IFELSE( + AC_LANG_PROGRAM( + [[[[ + #include + #include + #include + ]]]], + [[[[ + char buffer[] = "foo,bar,baz"; + char *token; + char *dummy; + char *saveptr; + + dummy = buffer; + saveptr = NULL; + while ((token = strtok_r (dummy, ",", &saveptr)) != NULL) + { + dummy = NULL; + printf ("token = %s;\n", token); + } + ]]]]), + [have_strtok_r_default="yes"], + [have_strtok_r_default="no"] + ) + ) + + if test "x$have_strtok_r_default" = "xno" + then + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -D_REENTRANT=1" + + AC_CACHE_CHECK([if strtok_r needs _REENTRANT], + [have_strtok_r_reentrant], + AC_LINK_IFELSE( + AC_LANG_PROGRAM( + [[[[ + #include + #include + #include + ]]]], + [[[[ + char buffer[] = "foo,bar,baz"; + char *token; + char *dummy; + char *saveptr; + + dummy = buffer; + saveptr = NULL; + while ((token = strtok_r (dummy, ",", &saveptr)) != NULL) + { + dummy = NULL; + printf ("token = %s;\n", token); + } + ]]]]), + [have_strtok_r_reentrant="yes"], + [AC_MSG_FAILURE([strtok_r isn't available. Please file a bugreport!])] + ) + ) + fi + AC_CHECK_FUNCS(getpwnam_r getgrnam_r setgroups regcomp regerror regexec regfree) socket_needs_socket="no" @@@ -811,9 -872,6 +873,9 @@@ AC_CHECK_MEMBERS([kstat_io_t.nwritten, #endif ]) +# +# Checks for libraries begin here +# with_libresolv="yes" AC_CHECK_LIB(resolv, res_search, [ @@@ -1029,14 -1087,12 +1091,14 @@@ AC_CHECK_LIB(IOKit, IOServiceGetMatchin AC_DEFINE_UNQUOTED(COLLECT_LIBIOKIT, [$collect_libiokit], [Wether or not to use the IOKit library]) AM_CONDITIONAL(BUILD_WITH_LIBIOKIT, test "x$with_libiokit" = "xyes") +with_libstatgrab_cflags="" +with_libstatgrab_ldflags="" AC_ARG_WITH(libstatgrab, [AS_HELP_STRING([--with-libstatgrab@<:@=PREFIX@:>@], [Path to libstatgrab.])], [ if test "x$withval" != "xno" -a "x$withval" != "xyes" then - LDFLAGS="$LDFLAGS -L$withval/lib" - CPPFLAGS="$CPPFLAGS -I$withval/include" + with_libstatgrab_cflags="-I$withval/include" + with_libstatgrab_ldflags="-L$withval/lib" with_libstatgrab="yes" fi ], @@@ -1048,93 -1104,28 +1110,93 @@@ with_libstatgrab="no" fi ]) -if test "x$with_libstatgrab" = "xyes" +with_libstatgrab_pkg_config="yes" +if test "x$with_libstatgrab" = "xyes" \ + && test "x$PKG_CONFIG" != "x" then - AC_CHECK_LIB(statgrab, sg_init, [with_libstatgrab="yes"], [with_libstatgrab="no (libstatgrab not found)"]) + AC_MSG_CHECKING([pkg-config for libstatgrab]) + temp_result="found" + $PKG_CONFIG --exists libstatgrab 2>/dev/null + if test "$?" != "0" + then + with_libstatgrab_pkg_config="no" + temp_result="not found" + fi + AC_MSG_RESULT([$temp_result]) +else + AC_MSG_NOTICE([pkg-config not available, trying to guess flags for the statgrab library.]) + with_libstatgrab_pkg_config="no" + with_libstatgrab_ldflags="$with_libstatgrab_ldflags -lstatgrab" fi -if test "x$with_libstatgrab" = "xyes" + +if test "x$with_libstatgrab" = "xyes" \ + && test "x$with_libstatgrab_pkg_config" = "xyes" \ + && test "x$with_libstatgrab_cflags" = "x" +then + AC_MSG_CHECKING([for libstatgrab CFLAGS]) + temp_result="`$PKG_CONFIG --cflags libstatgrab`" + if test "$?" = "0" + then + with_libstatgrab_cflags="$temp_result" + else + with_libstatgrab="no ($PKG_CONFIG --cflags libstatgrab failed)" + temp_result="$PKG_CONFIG --cflags libstatgrab failed" + fi + AC_MSG_RESULT([$temp_result]) +fi + +if test "x$with_libstatgrab" = "xyes" \ + && test "x$with_libstatgrab_pkg_config" = "xyes" \ + && test "x$with_libstatgrab_ldflags" = "x" then - AC_CHECK_HEADERS(statgrab.h,, [with_libstatgrab="no (statgrab.h not found)"]) + AC_MSG_CHECKING([for libstatgrab LDFLAGS]) + temp_result="`$PKG_CONFIG --libs libstatgrab`" + if test "$?" = "0" + then + with_libstatgrab_ldflags="$temp_result" + else + with_libstatgrab="no ($PKG_CONFIG --libs libstatgrab failed)" + temp_result="$PKG_CONFIG --libs libstatgrab failed" + fi + AC_MSG_RESULT([$temp_result]) fi + if test "x$with_libstatgrab" = "xyes" then - AC_CHECK_LIB(devstat, getdevs, [with_libdevstat="yes"], [with_libdevstat="no"]) + SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $with_libstatgrab_cflags" + + AC_CHECK_HEADERS(statgrab.h, + [with_libstatgrab="yes"], + [with_libstatgrab="no (statgrab.h not found)"]) + + CPPFLAGS="$SAVE_CPPFLAGS" fi + if test "x$with_libstatgrab" = "xyes" then - collect_libstatgrab=1 -else - collect_libstatgrab=0 + SAVE_CFLAGS="$CFLAGS" + SAVE_LDFLAGS="$LDFLAGS" + + CFLAGS="$CFLAGS $with_libstatgrab_cflags" + LDFLAGS="$LDFLAGS $with_libstatgrab_ldflags" + + AC_CHECK_LIB(statgrab, sg_init, + [with_libstatgrab="yes"], + [with_libstatgrab="no (symbol sg_init not found)"]) + + CFLAGS="$SAVE_CFLAGS" + LDFLAGS="$SAVE_LDFLAGS" fi -AC_DEFINE_UNQUOTED(COLLECT_LIBSTATGRAB, [$collect_libstatgrab], - [Wether or not to use statgrab library]) + AM_CONDITIONAL(BUILD_WITH_LIBSTATGRAB, test "x$with_libstatgrab" = "xyes") -AM_CONDITIONAL(BUILD_WITH_LIBDEVSTAT, test "x$with_libdevstat" = "xyes") +if test "x$with_libstatgrab" = "xyes" +then + BUILD_WITH_LIBSTATGRAB_CFLAGS="$with_libstatgrab_cflags" + BUILD_WITH_LIBSTATGRAB_LDFLAGS="$with_libstatgrab_ldflags" + AC_SUBST(BUILD_WITH_LIBSTATGRAB_CFLAGS) + AC_SUBST(BUILD_WITH_LIBSTATGRAB_LDFLAGS) +fi AC_CHECK_LIB(kvm, kvm_getswapinfo, [with_libkvm="yes"], [with_libkvm="no"]) if test "x$with_libkvm" = "xyes" @@@ -1420,9 -1411,19 +1482,19 @@@ AC_ARG_WITH(libperl, [AS_HELP_STRING([- with_libperl="yes" ]) + AC_MSG_CHECKING([for perl]) + perl_interpreter=`which "$perl_interpreter" 2> /dev/null` + if test -x "$perl_interpreter" + then + AC_MSG_RESULT([yes]) + else + perl_interpreter="" + AC_MSG_RESULT([no]) + fi + AC_SUBST(PERL, "$perl_interpreter") - if test "x$with_libperl" = "xyes" + if test "x$with_libperl" = "xyes" -a -n "$perl_interpreter" then SAVE_CFLAGS=$CFLAGS SAVE_LDFLAGS=$LDFLAGS @@@ -1462,7 -1463,10 +1534,10 @@@ CFLAGS=$SAVE_CFLAGS LDFLAGS=$SAVE_LDFLAGS - fi + else if test -z "$perl_interpreter"; then + with_libperl="no (no perl interpreter found)" + have_libperl="no" + fi; fi AM_CONDITIONAL(BUILD_WITH_LIBPERL, test "x$with_libperl" = "xyes") AC_ARG_WITH(libiptc, [AS_HELP_STRING([--with-libiptc@<:@=PREFIX@:>@], [Path to libiptc.])], @@@ -2132,7 -2136,12 +2207,12 @@@ AC_ARG_WITH(perl-bindings, [AS_HELP_STR ], [ PERL_BINDINGS_OPTIONS="" - with_perl_bindings="yes" + if test -n "$perl_interpreter" + then + with_perl_bindings="yes" + else + with_perl_bindings="no (no perl interpreter found)" + fi ]) if test "x$with_perl_bindings" = "xyes" then