From d855b57b7cff885fb853dee89d637b07c2dbaf84 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 22 May 2009 09:26:36 -0700
Subject: [PATCH] SLES Fixes (Part 1): - ZFS_AC_KERNEL updated to exclude -obj
 entries in /usr/src/ when   attempting to automatically detect your kernel
 source. - ZFS_AC_KERNEL check for *-obj directory when attempting to   detect
 the objects for your kernel source. - ZFS_AC_SPL updated to additionally
 check for Modules.symvers build   product.  This seems to be specific to SLES
 system, for Vanilla,   Fedora, RHEL, and Chaos kernels the symbol file is
 just called   Module.symvers. - ZFS_CHECK_SYMBOL_EXPORT also should also
 check the exported SPL   symbols in addition to the exported core kernel
 systems.

---
 config/zfs-build.m4 | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
index 624c941f7c..168418de4b 100644
--- a/config/zfs-build.m4
+++ b/config/zfs-build.m4
@@ -1,6 +1,4 @@
 AC_DEFUN([ZFS_AC_KERNEL], [
-	ver=`uname -r`
-
 	AC_ARG_WITH([linux],
 		AS_HELP_STRING([--with-linux=PATH],
 		[Path to kernel source]),
@@ -13,12 +11,12 @@ AC_DEFUN([ZFS_AC_KERNEL], [
 
 	AC_MSG_CHECKING([kernel source directory])
 	if test -z "$kernelsrc"; then
-		kernelbuild=
-		sourcelink=`ls -1d /usr/src/kernels/* /usr/src/linux-* 2>/dev/null | tail -1`
+		sourcelink=`ls -1d /usr/src/kernels/* /usr/src/linux-* \
+                            2>/dev/null | grep -v obj | tail -1`
 
 		if test -e $sourcelink; then
 			kernelsrc=`readlink -f ${sourcelink}`
-			kernelbuild=${kernelsrc}
+			kernelbuild=
 		else
 			AC_MSG_RESULT([Not found])
 			AC_MSG_ERROR([
@@ -33,6 +31,11 @@ AC_DEFUN([ZFS_AC_KERNEL], [
 
 	AC_MSG_RESULT([$kernelsrc])
 	AC_MSG_CHECKING([kernel build directory])
+        if test -z "$kernelbuild" && test -d ${kernelsrc}-obj; then
+                kernelbuild=${kernelsrc}-obj/`arch`/`arch`
+        else
+                kernelbuild=${kernelsrc}
+        fi
 	AC_MSG_RESULT([$kernelbuild])
 
 	AC_MSG_CHECKING([kernel source version])
@@ -72,7 +75,6 @@ AC_DEFUN([ZFS_AC_KERNEL], [
 ])
 
 AC_DEFUN([ZFS_AC_SPL], [
-
 	AC_ARG_WITH([spl],
 		AS_HELP_STRING([--with-spl=PATH],
 		[Path to spl source]),
@@ -118,14 +120,18 @@ AC_DEFUN([ZFS_AC_SPL], [
 	AC_MSG_CHECKING([spl Module.symvers])
 	if test -r $splbuild/module/Module.symvers; then
 		splsymvers=$splbuild/module/Module.symvers
+	elif test -r $splbuild/module/Modules.symvers; then
+		splsymvers=$splbuild/module/Modules.symvers
 	elif test -r $kernelbuild/include/spl/Module.symvers; then
 		splsymvers=$kernelbuild/include/spl/Module.symvers
+	elif test -r $kernelbuild/include/spl/Modules.symvers; then
+		splsymvers=$kernelbuild/include/spl/Modules.symvers
 	fi
 
 	if test -z "$splsymvers"; then
 	        AC_MSG_RESULT([Not found])
 	        AC_MSG_ERROR([
-                *** Cannot find extra Module.symvers in the spl source.
+                *** Cannot find extra Module{s}.symvers in the spl source.
                 *** Please prepare the spl source before running this script])
 	fi
 
@@ -330,7 +336,8 @@ dnl # check symbol exported or not
 dnl #
 AC_DEFUN([ZFS_CHECK_SYMBOL_EXPORT],
 	[AC_MSG_CHECKING([whether symbol $1 is exported])
-	grep -q -E '[[[:space:]]]$1[[[:space:]]]' $LINUX/Module.symvers 2>/dev/null
+	grep -q -E '[[[:space:]]]$1[[[:space:]]]' \
+		$LINUX/Module.symvers $splsymvers 2>/dev/null
 	rc=$?
 	if test $rc -ne 0; then
 		export=0