X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=config%2Flustre-build-zfs.m4;h=df78230761c555a4e73b6552439e9eab0b35855a;hp=f200d01908a4656d077ebf73179733c451ac9721;hb=369e02e84f39565195e08f043ab0421d2d3bd185;hpb=4dd31baae9a73502c5c7bb5c0962fd703e231fd5;ds=sidebyside

diff --git a/config/lustre-build-zfs.m4 b/config/lustre-build-zfs.m4
index f200d01..df78230 100644
--- a/config/lustre-build-zfs.m4
+++ b/config/lustre-build-zfs.m4
@@ -291,7 +291,7 @@ AC_DEFUN([LB_ZFS_USER], [
 	dnl #
 	AC_MSG_CHECKING([zfs devel headers])
 	AS_IF([test -z "${zfslib}"], [
-        	AS_IF([test -e $zfssrc/include/libzfs.h && test -e $zfssrc/lib/libspl/include], [
+        	AS_IF([test -e "${zfssrc}/include/libzfs.h" && test -e "${zfssrc}/lib/libspl/include"], [
                 	zfslib="-I $zfssrc/lib/libspl/include -I $zfssrc/include"
 		], [test -d /usr/include/libzfs && test -d /usr/include/libspl], [
 			zfslib="-I /usr/include/libspl -I /usr/include/libzfs"
@@ -371,5 +371,20 @@ your distribution.
 		])
 	])
 
+	AS_IF([test x$enable_zfs = xyes], [
+		AC_MSG_CHECKING([if zfs defines dsl_pool_config_enter/exit])
+		LB_LINUX_TRY_COMPILE([
+			#include <sys/dsl_pool.h>
+		],[
+			dsl_pool_config_enter(NULL, FTAG);
+		],[
+			AC_MSG_RESULT([yes])
+				AC_DEFINE(HAVE_DSL_POOL_CONFIG, 1,
+					  [Have dsl_pool_config_enter/exit in ZFS])
+		],[
+			AC_MSG_RESULT([no])
+		])
+	])
+
 	AM_CONDITIONAL(ZFS_ENABLED, test x$enable_zfs = xyes)
 ])