X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=configure.ac;h=438d567f55982ddd8f060cafc476e8789a1f36eb;hp=834a2336bebe1dc2d3ab4015217208e3a2d65d41;hb=80294418289129eb75c9f07e2043adcbd02941a4;hpb=cd401b9728839f8b24fd16fac9e9c1753526fd4e

diff --git a/configure.ac b/configure.ac
index 834a2336..438d567f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -805,30 +805,10 @@ AC_CACHE_CHECK([whether clock_boottime and clock_monotonic are supported],
 
 
 # For the turbostat plugin
-have_asm_msrindex_h="no"
-AC_CHECK_HEADERS(asm/msr-index.h, [have_asm_msrindex_h="yes"])
-
-if test "x$have_asm_msrindex_h" = "xyes"
-then
-  AC_CACHE_CHECK([whether asm/msr-index.h has MSR_PKG_C10_RESIDENCY],
-                 [c_cv_have_usable_asm_msrindex_h],
-                 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-[[[
-#include<asm/msr-index.h>
-]]],
-[[[
-int y = MSR_PKG_C10_RESIDENCY;
-return(y);
-]]]
-  )],
-                 [c_cv_have_usable_asm_msrindex_h="yes"],
-                 [c_cv_have_usable_asm_msrindex_h="no"],
-                                  )
-                 )
-fi
-
-have_cpuid_h="no"
-AC_CHECK_HEADERS(cpuid.h, [have_cpuid_h="yes"])
+AC_CHECK_HEADERS([cpuid.h],
+  [have_cpuid_h="yes"],
+  [have_cpuid_h="no (cpuid.h not found)"]
+)
 
 have_capability="yes"
 AC_CHECK_HEADERS(sys/capability.h,
@@ -6143,8 +6123,7 @@ then
 	then
 		plugin_ipvs="yes"
 	fi
-	if test "x$c_cv_have_usable_asm_msrindex_h" = "xyes" && test "x$have_cpuid_h" = "xyes"
-	then
+	if test "x$have_cpuid_h" = "xyes"; then
 		plugin_turbostat="yes"
 	fi
 	
@@ -6329,7 +6308,7 @@ then
 	plugin_df="yes"
 fi
 
-if test "x$c_cv_have_getmntent_r" = "xyes"
+if test "x$have_getmntent_r" = "xyes"
 then
 	plugin_df="yes"
 fi