From: Kris Van Hees <aedil-afs@alchar.org>
Date: Thu, 10 Jul 2003 22:52:29 +0000 (+0000)
Subject: STABLE12-linux-usermode-better-test-20030710
X-Git-Tag: openafs-stable-1_2_10~11
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c1c52e5f15f50414b84bee6a92462a5a89e54448;p=packages%2Fo%2Fopenafs.git

STABLE12-linux-usermode-better-test-20030710


test the source tree and not the running kernel


(cherry picked from commit ddac9ce59abee2f53d6243b05c502966dfc9ad56)
---

diff --git a/acinclude.m4 b/acinclude.m4
index a16d87633..870ecd3d6 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -493,11 +493,13 @@ else
 			fi
 			_AFS_SYSNAME=`echo $AFS_SYSNAME|sed s/XX\$/$AFS_SYSKVERS/`
 			AFS_SYSNAME="$_AFS_SYSNAME"
-			AFS_ISUML=`cat /proc/cpuinfo | awk '/^model name/ {print $[]4}'`
-			if test "x${AFS_ISUML}" = "xUML"; then
-			 _AFS_SYSNAME=`echo $AFS_SYSNAME|sed s/linux/umlinux/`
+			if test -f "$LINUX_KERNEL_PATH/include/linux/autoconf.h"; then
+			 AFS_ISUML=`awk '$[]2 == "CONFIG_USERMODE"{print $[]3}' $LINUX_KERNEL_PATH/include/linux/autoconf.h`
+			 if test "x${AFS_ISUML}" = "x1"; then
+			  _AFS_SYSNAME=`echo $AFS_SYSNAME|sed s/linux/umlinux/`
+			 fi
+			 AFS_SYSNAME="$_AFS_SYSNAME"
 			fi
-			AFS_SYSNAME="$_AFS_SYSNAME"
 			;;
 	esac
         AC_MSG_RESULT($AFS_SYSNAME)