Index: acinclude.m4
===================================================================
RCS file: /cvs/openafs/acinclude.m4,v
retrieving revision 1.117
diff -u -r1.117 acinclude.m4
--- acinclude.m4	25 Aug 2004 20:39:21 -0000	1.117
+++ acinclude.m4	18 Oct 2004 01:00:01 -0000
@@ -157,6 +157,10 @@
 		fi
 		AC_MSG_RESULT(linux)
 		if test "x$enable_kernel_module" = "xyes"; then
+		 AFS_SYSKVERS=`echo $LINUX_VERSION | awk -F\. '{print $[]1 $[]2}'`
+		 if test "x${AFS_SYSKVERS}" = "x"; then
+		        AC_MSG_ERROR(Couldn't guess your Linux version [2])
+		 fi
 		 if test "x$enable_debug_kernel" = "xno"; then
 			LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -fomit-frame-pointer"
 		 fi
@@ -194,7 +198,7 @@
 		 LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_SIGHAND
 		 LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_SIGMASK_LOCK
 		 LINUX_WHICH_MODULES
-                 if test "x$ac_cv_linux_config_modversions" = "xno"; then
+                 if test "x$ac_cv_linux_config_modversions" = "xno" -o $AFS_SYSKVERS -ge 26; then
                    AC_MSG_WARN([Cannot determine sys_call_table status. assuming it isn't exported])
                    ac_cv_linux_exports_sys_call_table=no
 		   if test -f "$LINUX_KERNEL_PATH/include/asm/ia32_unistd.h"; then
@@ -643,7 +647,6 @@
 	esac
 	case $AFS_SYSNAME in
 		*_linux*)
-			AFS_SYSKVERS=`echo $LINUX_VERSION | awk -F\. '{print $[]1 $[]2}'`
 			if test "x${AFS_SYSKVERS}" = "x"; then
 			 AC_MSG_ERROR(Couldn't guess your Linux version. Please use the --with-afs-sysname option to configure an AFS sysname.)
 			fi
Index: src/cf/linux-test3.m4
===================================================================
RCS file: /cvs/openafs/src/cf/linux-test3.m4,v
retrieving revision 1.10
diff -u -r1.10 linux-test3.m4
--- src/cf/linux-test3.m4	26 Aug 2004 18:14:37 -0000	1.10
+++ src/cf/linux-test3.m4	18 Oct 2004 01:00:01 -0000
@@ -45,7 +45,7 @@
 [#include <linux/version.h>
 #include <linux/config.h>
 ],
-[#if !defined(CONFIG_MODVERSIONS) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
+[#if !defined(CONFIG_MODVERSIONS)
 lose;
 #endif
 ],
@@ -53,7 +53,9 @@
   ac_cv_linux_config_modversions=no)])
   AC_MSG_RESULT($ac_cv_linux_config_modversions)
   AC_MSG_CHECKING(which kernel modules to build)
-  if test "x$ac_linux_rhconfig" = "xyes" -o "x$ac_cv_linux_config_modversions" = "xno"; then
+  if test "x$ac_linux_rhconfig" = "xyes"; then
+      MPS="MP SP"
+  elif test "x$ac_cv_linux_config_modversions" = "xno" -a "$AFS_SYSKVERS" -lt 26; then
       MPS="MP SP"
   else
   AC_CACHE_VAL(ac_cv_linux_config_smp, [