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

2 files changed, 18 insertions, 6 deletions

diff --git a/configure.in b/configure.in
index 43fe4ade..2be2a1c6 100644
--- a/configure.in
+++ b/configure.in
@@ -1270,12 +1270,20 @@ fi
 
 AC_MSG_CHECKING([for number of cpus])
 AC_TRY_COMPILE([#include <unistd.h>],
-        [sysconf(_SC_NPROCESSORS_CONF) > 0;],
-        AC_DEFINE(HAVE_SYSCONF__SC_NPROCESSORS_CONF,1,[Define if sysconf returns number of cpus])
-        AC_MSG_RESULT([sysconf(_SC_NPROCESSORS_CONF)]),
+        [sysconf(_SC_NPROCESSORS_ONLN) > 0;],
+        AC_DEFINE(HAVE_SYSCONF__SC_NPROCESSORS_ONLN,1,[Define if sysconf returns number of cpus])
+        AC_MSG_RESULT([sysconf(_SC_NPROCESSORS_ONLN)]),
         AC_MSG_RESULT([cannot calculate])
         )
 
+AC_TRY_COMPILE([#include <unistd.h>],
+        [sysconf(_SC_NPROCESSORS_CONF) > 0;],
+        AC_DEFINE(HAVE_SYSCONF__SC_NPROCESSORS_CONF,1,[Define if sysconf returns number of cpus])
+        AC_MSG_RESULT([sysconf(_SC_NPROCESSORS_CONF)]),
+        AC_MSG_RESULT([cannot calculate])
+        )
+
+
 AC_PATH_PROG(PATH_TO_UPTIME,uptime)
 AC_ARG_WITH(uptime_command,
             ACX_HELP_STRING([--with-uptime-command=PATH],
diff --git a/plugins/common.h b/plugins/common.h
index c0dc2f41..858329fd 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -82,10 +82,14 @@
    getting that data
    Will return -1 if cannot get data
 */
-#ifdef HAVE_SYSCONF__SC_NPROCESSORS_CONF 
-#define GET_NUMBER_OF_CPUS() sysconf(_SC_NPROCESSORS_CONF)
+#ifdef HAVE_SYSCONF__SC_NPROCESSORS_ONLN
+#define GET_NUMBER_OF_CPUS() sysconf(_SC_NPROCESSORS_ONLN)
 #else
-#define GET_NUMBER_OF_CPUS() -1
+# ifdef HAVE_SYSCONF__SC_NPROCESSORS_CONF
+#  define GET_NUMBER_OF_CPUS() sysconf(_SC_NPROCESSORS_CONF)
+# else
+#  define GET_NUMBER_OF_CPUS() -1
+# endif
 #endif
 
 #ifdef TIME_WITH_SYS_TIME