summaryrefslogtreecommitdiff
path: root/m4/ax_count_cpus.m4
diff options
context:
space:
mode:
authorKarlson2k <k2k@narod.ru>2016-04-14 21:08:59 +0300
committerKarlson2k <k2k@narod.ru>2016-04-16 15:29:30 +0300
commit40ddc450fc2ca5fe9a20ef373f8418c385aa5ce0 (patch)
tree4ba1de6d098391b66cecf595c1c89ecd838393b5 /m4/ax_count_cpus.m4
parent15f2ffb15d0d4355006a030bc19575c6ef560065 (diff)
downloadautoconf-archive-40ddc450fc2ca5fe9a20ef373f8418c385aa5ce0.tar.gz
AX_COUNT_CPUS: added protection from garbage in CPU_COUNT
Diffstat (limited to 'm4/ax_count_cpus.m4')
-rw-r--r--m4/ax_count_cpus.m411
1 files changed, 6 insertions, 5 deletions
diff --git a/m4/ax_count_cpus.m4 b/m4/ax_count_cpus.m4
index 89c761e..a698f6e 100644
--- a/m4/ax_count_cpus.m4
+++ b/m4/ax_count_cpus.m4
@@ -58,16 +58,17 @@
])
])
- AS_IF([test "x$CPU_COUNT" = "x0"],[dnl
- m4_ifvaln([$2],[dnl
+ AS_IF([[test "x$CPU_COUNT" != "x0" && test "$CPU_COUNT" -gt 0 2>/dev/null]],[dnl
+ AC_MSG_RESULT([[$CPU_COUNT]])
+ m4_ifvaln([$1],[$1],)dnl
+ ],[dnl
+ m4_ifval([$2],[dnl
+ AS_UNSET([[CPU_COUNT]])
AC_MSG_RESULT([[unable to detect]])
$2
], [dnl
CPU_COUNT="1"
AC_MSG_RESULT([[unable to detect (assuming 1)]])
])dnl
- ],[dnl
- AC_MSG_RESULT([[$CPU_COUNT]])
- m4_ifvaln([$1],[$1],)dnl
])dnl
])dnl