projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4568786
)
Turbostat: build only if requirements are met
author
Vincent Brillault
<git@lerya.net>
Fri, 17 Apr 2015 15:18:06 +0000
(17:18 +0200)
committer
Vincent Brillault
<git@lerya.net>
Fri, 17 Apr 2015 15:18:06 +0000
(17:18 +0200)
configure.ac
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index
8201981
..
35ce32b
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-590,6
+590,12
@@
have_termios_h="no"
AC_CHECK_HEADERS(termios.h, [have_termios_h="yes"])
# For the turbostat plugin
AC_CHECK_HEADERS(termios.h, [have_termios_h="yes"])
# For the turbostat plugin
+have_asm_msrindex_h="no"
+AC_CHECK_HEADERS(asm/msr-index.h, [have_asm_msrindex_h="yes"])
+
+have_cpuid_h="no"
+AC_CHECK_HEADERS(cpuid.h, [have_cpuid_h="yes"])
+
AC_CHECK_HEADERS(sys/capability.h)
#
# Checks for typedefs, structures, and compiler characteristics.
AC_CHECK_HEADERS(sys/capability.h)
#
# Checks for typedefs, structures, and compiler characteristics.
@@
-5177,7
+5183,6
@@
then
plugin_swap="yes"
plugin_tcpconns="yes"
plugin_thermal="yes"
plugin_swap="yes"
plugin_tcpconns="yes"
plugin_thermal="yes"
- plugin_turbostat="yes"
plugin_uptime="yes"
plugin_vmem="yes"
plugin_vserver="yes"
plugin_uptime="yes"
plugin_vmem="yes"
plugin_vserver="yes"
@@
-5188,6
+5193,10
@@
then
then
plugin_ipvs="yes"
fi
then
plugin_ipvs="yes"
fi
+ if test "x$have_asm_msrindex_h" = "xyes" && test "x$have_cpuid_h" = "xyes"
+ then
+ plugin_turbostat="yes"
+ fi
fi
if test "x$ac_system" = "xOpenBSD"
fi
if test "x$ac_system" = "xOpenBSD"