From: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
Date: Sun, 19 Oct 2014 06:42:08 +0000 (-0400)
Subject: Linux: get sysname even if kernel module disabled
X-Git-Tag: upstream/1.8.0_pre1^2~418
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c11c58646f56f0adc2016e31a7d3a3d34d6cdd3a;p=packages%2Fo%2Fopenafs.git

Linux: get sysname even if kernel module disabled

Fall back to `uname -r` if we aren't probing for kernel sources,
as we still need to know for the rest of the build.  While this
could be worked around by explicitly passing the sysname as an
argument, this seems friendlier.

Change-Id: I0db75ba5fc7d1f5ec08d27dfce6858b968b6ce28
Reviewed-on: http://gerrit.openafs.org/11552
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
---

diff --git a/acinclude.m4 b/acinclude.m4
index 96adde044..24d072108 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -428,14 +428,18 @@ case $system in
                  SUBARCH=default
 		fi
 		AC_MSG_RESULT(linux)
+                GUESS_LINUX_VERSION=
                 if test "x$enable_kernel_module" = "xyes"; then
-                 case "$LINUX_VERSION" in
+                 GUESS_LINUX_VERSION=${LINUX_VERSION}
+                else
+                 GUESS_LINUX_VERSION=`uname -r`
+                fi
+                case "$GUESS_LINUX_VERSION" in
                   2.2.*) AFS_SYSKVERS=22 ;;
                   2.4.*) AFS_SYSKVERS=24 ;;
                   2.6.* | 3.*) AFS_SYSKVERS=26 ;;
                   *) AC_MSG_ERROR(Couldn't guess your Linux version [2]) ;;
-                 esac
-                fi
+                esac
                 ;;
         *-solaris*)
 		MKAFS_OSTYPE=SOLARIS