From: Chunwei Chen <david.chen@osnexus.com>
Date: Wed, 24 May 2017 23:02:04 +0000 (-0700)
Subject: config: allow --with-linux without --with-linux-obj
X-Git-Tag: zfs-0.7.0-rc5~83
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d8da991714dd78ea2540005ca57792832152c9c;p=zfs

config: allow --with-linux without --with-linux-obj

Don't use `uname -r` to determine kernel build directory when the user
specified kernel source with --with-linux. Otherwise, the user is forced
to use --with-linux-obj even if they are the same directory, which is
very counterintuitive.

Signed-off-by: Chunwei Chen <david.chen@osnexus.com>
Requires-spl: refs/pull/617/head
---

diff --git a/config/kernel.m4 b/config/kernel.m4
index c96c8b17f..324ab816f 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -202,6 +202,7 @@ AC_DEFUN([ZFS_AC_KERNEL], [
 		AS_IF([test "$kernelsrc" = "NONE"], [
 			kernsrcver=NONE
 		])
+		withlinux=yes
 	])
 
 	AC_MSG_RESULT([$kernelsrc])
@@ -214,7 +215,7 @@ AC_DEFUN([ZFS_AC_KERNEL], [
 
 	AC_MSG_CHECKING([kernel build directory])
 	AS_IF([test -z "$kernelbuild"], [
-		AS_IF([test -e "/lib/modules/$(uname -r)/build"], [
+		AS_IF([test x$withlinux != xyes -a -e "/lib/modules/$(uname -r)/build"], [
 			kernelbuild=`readlink -f /lib/modules/$(uname -r)/build`
 		], [test -d ${kernelsrc}-obj/${target_cpu}/${target_cpu}], [
 			kernelbuild=${kernelsrc}-obj/${target_cpu}/${target_cpu}