X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=7b665a97fff14abb4d774741329255845e728494;hb=e6d70fa125ef150a1437fc558a752ddc12067945;hp=765770b986693fe6e8d706cf06eec116e40a0382;hpb=e5a4207a2ac08312bdb4be0082bc4d84327e85e0;p=collectd.git diff --git a/configure.ac b/configure.ac index 765770b9..7b665a97 100644 --- a/configure.ac +++ b/configure.ac @@ -4143,8 +4143,8 @@ then CFLAGS="$CFLAGS $with_libstatgrab_cflags" LDFLAGS="$LDFLAGS $with_libstatgrab_ldflags" - AC_CACHE_CHECK([if sg_init() requires an argument], - [c_cv_have_libstatgrab_init_arg], + AC_CACHE_CHECK([if libstatgrab >= 0.90], + [c_cv_have_libstatgrab_0_90], AC_LINK_IFELSE([AC_LANG_PROGRAM( [[[ #include @@ -4154,42 +4154,8 @@ then if (sg_init()) return 0; ]]] )], - [c_cv_have_libstatgrab_init_arg="no"], - [c_cv_have_libstatgrab_init_arg="yes"] - ) - ) - - AC_CACHE_CHECK([if sg_get_user_stats() requires an argument], - [c_cv_have_libstatgrab_get_user_stats_arg], - AC_LINK_IFELSE([AC_LANG_PROGRAM( -[[[ -#include -#include -]]], -[[[ - if (sg_get_user_stats()) return 0; -]]] - )], - [c_cv_have_libstatgrab_get_user_stats_arg="no"], - [c_cv_have_libstatgrab_get_user_stats_arg="yes"] - ) - ) - - AC_CACHE_CHECK([if sg_disk_io_stats() uses size_t], - [c_cv_have_libstatgrab_get_disk_io_stats_sizet], - AC_LINK_IFELSE([AC_LANG_PROGRAM( -[[[ -#include -#include -]]], -[[[ - sg_disk_io_stats *(*ptr) (size_t *); - ptr = sg_get_disk_io_stats; - if (ptr != NULL) return 0; -]]] - )], - [c_cv_have_libstatgrab_get_disk_io_stats_sizet="yes"], - [c_cv_have_libstatgrab_get_disk_io_stats_sizet="no"] + [c_cv_have_libstatgrab_0_90="no"], + [c_cv_have_libstatgrab_0_90="yes"] ) ) @@ -4205,17 +4171,9 @@ then BUILD_WITH_LIBSTATGRAB_LDFLAGS="$with_libstatgrab_ldflags" AC_SUBST(BUILD_WITH_LIBSTATGRAB_CFLAGS) AC_SUBST(BUILD_WITH_LIBSTATGRAB_LDFLAGS) - if test "x$c_cv_have_libstatgrab_init_arg" = "xyes" - then - AC_DEFINE(HAVE_LIBSTATGRAB_INIT_ARG, 1, [Define to 1 if sg_init does require an argument]) - fi - if test "x$c_cv_have_libstatgrab_get_user_stats_arg" = "xyes" - then - AC_DEFINE(HAVE_LIBSTATGRAB_GET_USER_STATS_ARG, 1, [Define to 1 if sg_get_user_stats does require an argument]) - fi - if test "x$c_cv_have_libstatgrab_get_disk_io_stats_sizet" = "xyes" + if test "x$c_cv_have_libstatgrab_0_90" = "xyes" then - AC_DEFINE(HAVE_LIBSTATGRAB_GET_DISK_IO_STATS_SIZET, 1, [Define to 1 if sg_get_disk_io_stats does require pointer to size_t as an argument]) + AC_DEFINE(HAVE_LIBSTATGRAB_0_90, 1, [Define to 1 if libstatgrab version >= 0.90]) fi fi # }}}