summaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2013-08-19 22:47:00 +0200
committerHolger Weiss <holger@zedat.fu-berlin.de>2013-08-19 22:47:00 +0200
commita0640011730d830c562c87ca0bc6237c404146ea (patch)
tree9f18f239eb6fe6efe95e9dca32c428830418868f /configure.in
parent30aa7a63f1993ea09ba6ce84819d783f027ed516 (diff)
parentf12edfd07384be4060d5c724ac38ee212adc9028 (diff)
downloadmonitoring-plugins-a0640011730d830c562c87ca0bc6237c404146ea.tar.gz
Merge branch 'master' of https://github.com/bbense/nagios-plugins
* 'master' of https://github.com/bbense/nagios-plugins: Bug fix for ncpus if hyperthreading turned off in linux
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in14
1 files changed, 11 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index 43fe4ade..2be2a1c6 100644
--- a/configure.in
+++ b/configure.in
@@ -1270,12 +1270,20 @@ fi
1270 1270
1271AC_MSG_CHECKING([for number of cpus]) 1271AC_MSG_CHECKING([for number of cpus])
1272AC_TRY_COMPILE([#include <unistd.h>], 1272AC_TRY_COMPILE([#include <unistd.h>],
1273 [sysconf(_SC_NPROCESSORS_CONF) > 0;], 1273 [sysconf(_SC_NPROCESSORS_ONLN) > 0;],
1274 AC_DEFINE(HAVE_SYSCONF__SC_NPROCESSORS_CONF,1,[Define if sysconf returns number of cpus]) 1274 AC_DEFINE(HAVE_SYSCONF__SC_NPROCESSORS_ONLN,1,[Define if sysconf returns number of cpus])
1275 AC_MSG_RESULT([sysconf(_SC_NPROCESSORS_CONF)]), 1275 AC_MSG_RESULT([sysconf(_SC_NPROCESSORS_ONLN)]),
1276 AC_MSG_RESULT([cannot calculate]) 1276 AC_MSG_RESULT([cannot calculate])
1277 ) 1277 )
1278 1278
1279AC_TRY_COMPILE([#include <unistd.h>],
1280 [sysconf(_SC_NPROCESSORS_CONF) > 0;],
1281 AC_DEFINE(HAVE_SYSCONF__SC_NPROCESSORS_CONF,1,[Define if sysconf returns number of cpus])
1282 AC_MSG_RESULT([sysconf(_SC_NPROCESSORS_CONF)]),
1283 AC_MSG_RESULT([cannot calculate])
1284 )
1285
1286
1279AC_PATH_PROG(PATH_TO_UPTIME,uptime) 1287AC_PATH_PROG(PATH_TO_UPTIME,uptime)
1280AC_ARG_WITH(uptime_command, 1288AC_ARG_WITH(uptime_command,
1281 ACX_HELP_STRING([--with-uptime-command=PATH], 1289 ACX_HELP_STRING([--with-uptime-command=PATH],