LU-13906 build: Fix %{name}-osd-ldiskfs-mount

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

diff --git a/config/lustre-build-zfs.m4 b/config/lustre-build-zfs.m4
index 5a83455..f17f296 100644 (file)
--- a/config/lustre-build-zfs.m4
+++ b/config/lustre-build-zfs.m4
@@ -328,8 +328,8 @@ AC_DEFUN([LB_ZFS_USER], [
        AC_MSG_CHECKING([zfs devel headers])
        AS_IF([test -z "${zfsinc}"], [
                AS_IF([test -e "${zfssrc}/include/libzfs.h" && test -e "${zfssrc}/lib/libspl/include"], [
-                       zfsinc="-I $zfssrc/lib/libspl/include -I $zfssrc/include"
-                       zfslib="-L$zfssrc/lib/libzfs/.libs/ -L$zfssrc/lib/libnvpair/.libs"
+                       zfsinc="-I $zfssrc/lib/libspl/include -I $zfssrc/lib/libspl/include/os/linux -I $zfssrc/include"
+                       zfslib="-L$zfssrc/lib/libzfs/.libs/ -L$zfssrc/lib/libnvpair/.libs/ -L$zfssrc/lib/libzpool/.libs/"
                ], [test -d /usr/include/libzfs && test -d /usr/include/libspl], [
                        zfsinc="-I/usr/include/libspl -I /usr/include/libzfs"
                        zfslib=""
@@ -767,6 +767,19 @@ your distribution.
                        AC_DEFINE(HAVE_DB_DIRTY_RECORDS_LIST, 1,
                                [Have db_dirty_records list_t])
                ])
+               dnl #
+               dnl # ZFS 2.0 renamed sys/refcount.h to zfs_refcount.h
+               dnl # This build issue shows up with ZFS 2.0.7 and Lustre 2.12 LTS
+               dnl #
+               LB_CHECK_COMPILE([if ZFS renamed sys/refcount to zfs_refcount.h],
+               zfs_zfs_refcount, [
+                       #include <sys/zfs_refcount.h>
+               ],[
+                       zfs_refcount_add((zfs_refcount_t *) NULL, NULL);
+               ],[
+                       AC_DEFINE(HAVE_ZFS_REFCOUNT_HEADER, 1,
+                               [Have zfs_refcount.h])
+               ])
        ])
 
        AS_IF([test "x$enable_zfs" = xyes], [