From: Vincent Brillault Date: Wed, 22 Apr 2015 19:45:05 +0000 (+0200) Subject: Turbostat: test asm/msr-index.h compatibility X-Git-Tag: collectd-5.5.0~24^2~5 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=c97711a94a5ea5a7235991c06028468fb66e01b3;p=collectd.git Turbostat: test asm/msr-index.h compatibility Olds versions of asm/msr-index.h don't contain the required macros. Test at least if it contains MSR_CORE_C3_RESIDENCY --- diff --git a/configure.ac b/configure.ac index 35ce32ba..2ef82ee1 100644 --- a/configure.ac +++ b/configure.ac @@ -593,6 +593,12 @@ AC_CHECK_HEADERS(termios.h, [have_termios_h="yes"]) have_asm_msrindex_h="no" AC_CHECK_HEADERS(asm/msr-index.h, [have_asm_msrindex_h="yes"]) +have_usable_asm_msrindex_h="no" +if test "x$have_asm_msrindex_h" = "xyes" +then + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include]],[[int y = MSR_CORE_C3_RESIDENCY;]])], [have_usable_asm_msrindex_h="yes"]) +fi + have_cpuid_h="no" AC_CHECK_HEADERS(cpuid.h, [have_cpuid_h="yes"]) @@ -5193,7 +5199,7 @@ then then plugin_ipvs="yes" fi - if test "x$have_asm_msrindex_h" = "xyes" && test "x$have_cpuid_h" = "xyes" + if test "x$have_usable_asm_msrindex_h" = "xyes" && test "x$have_cpuid_h" = "xyes" then plugin_turbostat="yes" fi