LU-216 ldiskfs: use proper arguments for ldiskfs_free_blocks

[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..51c606b 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}"], [
-               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"
@@ -303,7 +303,9 @@ AC_DEFUN([LB_ZFS_USER], [
        AC_MSG_RESULT([$zfslib])
 
        ZFS_LIBZFS_INCLUDE=${zfslib}
+       ZFS_LIBZFS_LDFLAGS=-lzfs
        AC_SUBST(ZFS_LIBZFS_INCLUDE)
+       AC_SUBST(ZFS_LIBZFS_LDFLAGS)
 ])
 
 AC_DEFUN([LB_CONFIG_ZFS], [
@@ -371,5 +373,26 @@ your distribution.
                ])
        ])
 
-       AM_CONDITIONAL(ZFS_ENABLED, test x$enable_zfs = xyes)
+       AS_IF([test "x$enable_zfs" = xyes], [
+               LB_CHECK_COMPILE([if zfs defines dsl_pool_config_enter/exit],
+               dsl_pool_config_enter, [
+                       #include <sys/dsl_pool.h>
+               ],[
+                       dsl_pool_config_enter(NULL, FTAG);
+               ],[
+                       AC_DEFINE(HAVE_DSL_POOL_CONFIG, 1,
+                               [Have dsl_pool_config_enter/exit in ZFS])
+               ])
+               LB_CHECK_COMPILE([if zfs defines dsl_sync_task_do_nowait],
+               dsl_sync_task_do_nowait, [
+                       #include <sys/dsl_synctask.h>
+               ],[
+                       dsl_sync_task_do_nowait(NULL, NULL, NULL, NULL, NULL, 0, NULL);
+               ],[
+                       AC_DEFINE(HAVE_DSL_SYNC_TASK_DO_NOWAIT, 1,
+                               [Have dsl_sync_task_do_nowait in ZFS])
+               ])
+       ])
+
+       AM_CONDITIONAL(ZFS_ENABLED, [test "x$enable_zfs" = xyes])
 ])