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 a16d8763306acfbfbbb959f812c6414c17f22f51..870ecd3d6f25d097d02eb2631c8f06a15e4eacb1 100644 (file)
--- 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)