From 1d8da991714dd78ea2540005ca57792832152c9c Mon Sep 17 00:00:00 2001 From: Chunwei Chen Date: Wed, 24 May 2017 16:02:04 -0700 Subject: [PATCH] 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 Requires-spl: refs/pull/617/head --- config/kernel.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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} -- 2.40.0