From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:55:25 +0000 (+0000)
Subject: Handle the case where getconf exists, but doesn't know about
X-Git-Tag: 0.7.24ubuntu1~1189
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/911a4d763c4dcccbae9b7136bf1689ee3d88e3f1

Handle the case where getconf exists, but doesn't know about
Author: doogie
Date: 1999-12-10 04:39:51 GMT
Handle the case where getconf exists, but doesn't know about
_NPROCESSORS_ONLN.
---

diff --git a/buildlib/tools.m4 b/buildlib/tools.m4
index 32b7d7956..9aa9e12bf 100644
--- a/buildlib/tools.m4
+++ b/buildlib/tools.m4
@@ -16,23 +16,23 @@ AC_DEFUN(ah_HAVE_GETCONF,
 AC_DEFUN(ah_NUM_CPUS,
 	[AC_REQUIRE([ah_HAVE_GETCONF])
 	AC_MSG_CHECKING([number of cpus])
+	NUM_CPUS=
 	AC_ARG_WITH(cpus,
 		[  --with-cpus             The number of cpus to be used for building(see --with-procs, default 1)],
 		[if test "$withval" = "yes"; then
 			if test ! -z "$GETCONF";then
 				NUM_CPUS=`$GETCONF _NPROCESSORS_ONLN 2>/dev/null`
-			else
-				NUM_CPUS=1
 			fi
 		elif test ! "$withval" = "no";then
 			NUM_CPUS=$withval
 		fi],
 		[if test ! -z "$GETCONF";then
 			NUM_CPUS=`$GETCONF _NPROCESSORS_ONLN 2>/dev/null`
-		else
-			NUM_CPUS=1
-		fi]
+		]
 	)
+	if test -z "$NUM_CPUS"; then
+		NUM_CPUS=1
+	fi
 	if test $NUM_CPUS = 1 ;then
 		default_PROC_MULTIPLY=1
 	else