Merge pull request #806 from vincentbernat/fix/libstatgrab2

libstatgrab: only use one configure test for 0.90 API change

diff --combined configure.ac
index 765770b,d9a6b67..7b665a9
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -527,7 -527,7 +527,7 @@@ AC_CHECK_HEADERS(linux/un.h, [], []
  #endif
  ])
  
 -AC_CHECK_HEADERS(pwd.h grp.h sys/un.h ctype.h limits.h xfs/xqm.h fs_info.h fshelp.h paths.h mntent.h mnttab.h sys/fstyp.h sys/fs_types.h sys/mntent.h sys/mnttab.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/vfstab.h kvm.h wordexp.h locale.h)
 +AC_CHECK_HEADERS(pwd.h grp.h sys/un.h ctype.h limits.h xfs/xqm.h fs_info.h fshelp.h paths.h mntent.h mnttab.h sys/fstyp.h sys/fs_types.h sys/mntent.h sys/mnttab.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/vfstab.h sys/vmmeter.h kvm.h wordexp.h locale.h)
  
  # For the dns plugin
  AC_CHECK_HEADERS(arpa/nameser.h)
@@@ -4143,8 -4143,8 +4143,8 @@@ the
    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 <stdio.h>
@@@ -4154,42 -4154,8 +4154,8 @@@
        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 <stdio.h>
- #include <statgrab.h>
- ]]],
- [[[
-       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 <stdio.h>
- #include <statgrab.h>
- ]]],
- [[[
-       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 +4171,9 @@@ the
    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
  # }}}