From: Stephan Wiesand <stephan.wiesand@desy.de>
Date: Sat, 15 Dec 2012 14:36:24 +0000 (+0100)
Subject: Linux: Restructure kernel header detection
X-Git-Tag: upstream/1.8.0_pre1^2~1713
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=3f9d982;p=packages%2Fo%2Fopenafs.git

Linux: Restructure kernel header detection

As of kernel 3.7, version.h has moved, and hence utsrelease.h was
no longer found. Loop over candidate directories and locations
within, and look for the files we're actually after.

FIXES 131525

Change-Id: I686212a283b9e0ce769b1351e3cb75e08f4b110c
Reviewed-on: http://gerrit.openafs.org/8761
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Michael Laß <lass@mail.uni-paderborn.de>
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
---

diff --git a/acinclude.m4 b/acinclude.m4
index 44ce680c9..dc68e893d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -309,16 +309,20 @@ case $system in
 		 if test "x$with_linux_kernel_headers" != "x"; then
 		   LINUX_KERNEL_PATH="$with_linux_kernel_headers"
 		 else
-		   LINUX_KERNEL_PATH="/lib/modules/`uname -r`/source"
-		   if test ! -f "$LINUX_KERNEL_PATH/include/linux/version.h"; then
-		     LINUX_KERNEL_PATH="/lib/modules/`uname -r`/build"
-		   fi
-		   if test ! -f "$LINUX_KERNEL_PATH/include/linux/version.h"; then
-		     LINUX_KERNEL_PATH="/usr/src/linux-2.4"
-		   fi
-		   if test ! -f "$LINUX_KERNEL_PATH/include/linux/version.h"; then
-		     LINUX_KERNEL_PATH="/usr/src/linux"
-		   fi
+		   for utsdir in "/lib/modules/`uname -r`/build" \
+		                 "/lib/modules/`uname -r`/source" \
+		                 "/usr/src/linux-2.4" \
+		                 "/usr/src/linux"; do
+		     LINUX_KERNEL_PATH="$utsdir"
+		     for utsfile in "include/generated/utsrelease.h" \
+		                    "include/linux/utsrelease.h" \
+		                    "include/linux/version.h" \
+		                    "include/linux/version-up.h"; do
+		       if grep "UTS_RELEASE" "$utsdir/$utsfile" >/dev/null 2>&1; then
+		         break 2
+		       fi
+		     done
+		   done
 		 fi
 		 if test "x$with_linux_kernel_build" != "x"; then
 			 LINUX_KERNEL_BUILD="$with_linux_kernel_build"