LU-4196 build: Build support for OFED-3.5 and SLES 11

[fs/lustre-release.git] / config / lustre-build-zfs.m4

diff --git a/config/lustre-build-zfs.m4 b/config/lustre-build-zfs.m4
index f200d01..df78230 100644 (file)
--- 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}"], [
        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"
                        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)
 ])
        AM_CONDITIONAL(ZFS_ENABLED, test x$enable_zfs = xyes)
 ])