dnl # support was explicitly required if the headers cannot
dnl # be located it is treated as a fatal error.
dnl #
-dnl # * /var/lib/dkms/zfs/${VERSION}/build
+dnl # * /var/lib/dkms/zfs/${VERSION}/source
dnl # * /usr/src/zfs-${VERSION}/${LINUXRELEASE}
dnl # * /usr/src/zfs-${VERSION}
dnl # * ../spl/
dnl # - User provided directory where zfs development headers
dnl # are located. This option is typically used when user
dnl # uses rpm2cpio to unpack src rpm.
+dnl # Assumes layout of:
+dnl # ${zfs-devel-path}/usr/include/libzfs
+dnl # ${zfs-devel-path}/usr/include/libspl
+dnl # ${zfs-devel-path}/lib64/libzfs.so.* or
+dnl # ${zfs-devel-path}/lib/libzfs.so.*
dnl #
dnl # --with-zfs=path - Enable zfs support and use the zfs headers in the
dnl # provided path. No autodetection is performed and
dnl #
dnl # --with-spl - Enable spl support and attempt to autodetect the spl
dnl # --with-spl=yes headers in one of the following places in this order:
-dnl # * /var/lib/dkms/spl/${VERSION}/build
+dnl # * /var/lib/dkms/spl/${VERSION}/source
dnl # * /usr/src/spl-${VERSION}/${LINUXRELEASE}
dnl # * /usr/src/spl-${VERSION}
dnl # * ../spl/
dnl # source directory. In order of preference:
dnl #
splver=$(ls -1 /usr/src/ | grep -m1 spl | cut -f2 -d'-')
- splsrc0="/var/lib/dkms/spl/${splver}/build"
+ spldkms="/var/lib/dkms/spl/${splver}"
splsrc1="/usr/src/spl-${splver}/${LINUXRELEASE}"
splsrc2="/usr/src/spl-${splver}"
splsrc3="../spl/"
AC_MSG_CHECKING([spl source directory])
AS_IF([test -z "${splsrc}"], [
- AS_IF([test -e "${splsrc0}/spl.release.in"], [
- splsrc=${splsrc0}
+ AS_IF([test -e "${spldkms}/source/spl.release.in"], [
+ splsrc=${spldkms}/source
], [test -e "${splsrc1}/spl.release.in"], [
splsrc=${splsrc1}
], [test -e "${splsrc2}/spl.release.in"], [
dnl #
AC_MSG_CHECKING([spl build directory])
AS_IF([test -z "$splobj"], [
- AS_IF([test -e "${splsrc}/${LINUXRELEASE}/spl_config.h"], [
+ AS_IF([test "${splsrc}" = "${spldkms}/source"], [
+ AS_IF([test -e "${spldkms}/${LINUXRELEASE}/${target_cpu}/spl_config.h"], [
+ splobj=${spldkms}/${LINUXRELEASE}/${target_cpu}
+ ], [
+ splobj="[Not found]"
+ ])
+ ],[test -e "${splsrc}/${LINUXRELEASE}/spl_config.h"], [
splobj="${splsrc}/${LINUXRELEASE}"
], [test -e "${splsrc}/spl_config.h"], [
splobj="${splsrc}"
AC_MSG_CHECKING([spl file name for module symbols])
AS_IF([test -r $splobj/$SYMVERFILE], [
splsym=$SYMVERFILE
+ EXTRA_SYMBOLS="$EXTRA_SYMBOLS $splobj/$SYMVERFILE"
], [test -r $splobj/module/$SYMVERFILE], [
splsym=$SYMVERFILE
+ EXTRA_SYMBOLS="$EXTRA_SYMBOLS $splobj/module/$SYMVERFILE"
], [
splsym="[Not found]"
enable_zfs=no
SPL=${splsrc}
SPL_OBJ=${splobj}
SPL_VERSION=${splver}
- SPL_SYMBOLS=${splsym}
AC_SUBST(SPL)
AC_SUBST(SPL_OBJ)
AC_SUBST(SPL_VERSION)
- AC_SUBST(SPL_SYMBOLS)
+ AC_SUBST(EXTRA_SYMBOLS)
])
AC_DEFUN([LB_ZFS], [
dnl # source directory. In order of preference:
dnl #
zfsver=$(ls -1 /usr/src/ | grep -m1 zfs | cut -f2 -d'-')
- zfssrc0="/var/lib/dkms/zfs/${zfsver}/build"
+ zfsdkms="/var/lib/dkms/zfs/${zfsver}"
zfssrc1="/usr/src/zfs-${zfsver}/${LINUXRELEASE}"
zfssrc2="/usr/src/zfs-${zfsver}"
zfssrc3="../zfs/"
AC_MSG_CHECKING([zfs source directory])
AS_IF([test -z "${zfssrc}"], [
- AS_IF([test -e "${zfssrc0}/zfs.release.in"], [
- zfssrc=${zfssrc0}
+ AS_IF([test -e "${zfsdkms}/source/zfs.release.in"], [
+ zfssrc=${zfsdkms}/source
], [test -e "${zfssrc1}/zfs.release.in"], [
zfssrc=${zfssrc1}
], [test -e "${zfssrc2}/zfs.release.in"], [
dnl #
AC_MSG_CHECKING([zfs build directory])
AS_IF([test -z "$zfsobj"], [
- AS_IF([test -e "${zfssrc}/${LINUXRELEASE}/zfs_config.h"], [
+ AS_IF([test "${zfssrc}" = "${zfsdkms}/source"], [
+ AS_IF([test -e "${zfsdkms}/${LINUXRELEASE}/${target_cpu}/zfs_config.h"], [
+ zfsobj=${zfsdkms}/${LINUXRELEASE}/${target_cpu}
+ ], [
+ zfsobj="[Not found]"
+ ])
+ ], [test -e "${zfssrc}/${LINUXRELEASE}/zfs_config.h"], [
zfsobj="${zfssrc}/${LINUXRELEASE}"
], [test -e "${zfssrc}/zfs_config.h"], [
zfsobj="${zfssrc}"
AC_MSG_CHECKING([zfs file name for module symbols])
AS_IF([test -r $zfsobj/$SYMVERFILE], [
zfssym=$SYMVERFILE
+ EXTRA_SYMBOLS="$EXTRA_SYMBOLS $zfsobj/$SYMVERFILE"
], [test -r $zfsobj/module/$SYMVERFILE], [
zfssym=$SYMVERFILE
+ EXTRA_SYMBOLS="$EXTRA_SYMBOLS $zfsobj/module/$SYMVERFILE"
], [
zfssym="[Not found]"
enable_zfs=no
ZFS=${zfssrc}
ZFS_OBJ=${zfsobj}
ZFS_VERSION=${zfsver}
- ZFS_SYMBOLS=${zfssym}
AC_SUBST(ZFS)
AC_SUBST(ZFS_OBJ)
AC_SUBST(ZFS_VERSION)
- AC_SUBST(ZFS_SYMBOLS)
+ AC_SUBST(EXTRA_SYMBOLS)
])
AC_DEFUN([LB_ZFS_DEVEL], [
AC_MSG_CHECKING([user provided zfs devel headers])
AS_IF([test ! -z "${zfsdevel}"], [
AS_IF([test -d "${zfsdevel}/usr/include/libspl" && test -d "${zfsdevel}/usr/include/libzfs"], [
- zfslib="-I $zfsdevel/usr/include/libspl -I $zfsdevel/usr/include/libzfs"
+ zfsinc="-I $zfsdevel/usr/include/libspl -I $zfsdevel/usr/include/libzfs"
+ zfslib="-L$zfsdevel/usr/lib64 -L$zfsdevel/usr/lib -L$zfsdevel/lib64 -L$zfsdevel/lib"
], [
AC_MSG_ERROR([Path to development headers directory does not exist])
])
])
- AC_MSG_RESULT([$zfslib])
+ AC_MSG_RESULT([$zfsinc])
])
AC_DEFUN([LB_ZFS_USER], [
dnl # Detect user space zfs development headers.
dnl #
AC_MSG_CHECKING([zfs devel headers])
- AS_IF([test -z "${zfslib}"], [
+ AS_IF([test -z "${zfsinc}"], [
AS_IF([test -e "${zfssrc}/include/libzfs.h" && test -e "${zfssrc}/lib/libspl/include"], [
- zfslib="-I $zfssrc/lib/libspl/include -I $zfssrc/include"
+ zfsinc="-I $zfssrc/lib/libspl/include -I $zfssrc/include"
+ zfslib="-L$zfssrc/lib/libzfs/.libs/"
], [test -d /usr/include/libzfs && test -d /usr/include/libspl], [
- zfslib="-I /usr/include/libspl -I /usr/include/libzfs"
+ zfsinc="-I/usr/include/libspl -I /usr/include/libzfs"
+ zfslib=""
], [
- zfslib="[Not Found]"
+ zfsinc="[Not Found]"
+ zfslib=""
enable_zfs=no
])
])
- AC_MSG_RESULT([$zfslib])
+ AC_MSG_RESULT([$zfsinc])
- ZFS_LIBZFS_INCLUDE=${zfslib}
+ ZFS_LIBZFS_INCLUDE=${zfsinc}
+ ZFS_LIBZFS_LDFLAGS="-lzfs ${zfslib}"
AC_SUBST(ZFS_LIBZFS_INCLUDE)
+ AC_SUBST(ZFS_LIBZFS_LDFLAGS)
])
AC_DEFUN([LB_CONFIG_ZFS], [
AC_DEFINE(HAVE_DSL_SYNC_TASK_DO_NOWAIT, 1,
[Have dsl_sync_task_do_nowait in ZFS])
])
+ LB_CHECK_COMPILE([if zfs defines sa_spill_alloc],
+ sa_spill_alloc, [
+ #include <sys/kmem.h>
+ #include <sys/sa.h>
+ ],[
+ void *ptr;
+
+ ptr = sa_spill_alloc(KM_SLEEP);
+ sa_spill_free(ptr);
+ ],[
+ AC_DEFINE(HAVE_SA_SPILL_ALLOC, 1,
+ [Have sa_spill_alloc in ZFS])
+ ])
+ LB_CHECK_COMPILE([if zfs defines spa_maxblocksize],
+ spa_maxblocksize, [
+ #include <sys/spa.h>
+ ],[
+ spa_t *spa = NULL;
+ int size;
+
+ size = spa_maxblocksize(spa);
+ ],[
+ AC_DEFINE(HAVE_SPA_MAXBLOCKSIZE, 1,
+ [Have spa_maxblocksize in ZFS])
+ ])
])
AM_CONDITIONAL(ZFS_ENABLED, [test "x$enable_zfs" = xyes])
git://git.whamcloud.com / fs / lustre-release.git / blobdiff