Move more zfs test tools to zfs-test package (Closes: #868653)

[mirror_zfs-debian.git] / config / user.m4

diff --git a/config/user.m4 b/config/user.m4
index a79deefe85c4dc06b940a3c2d4283eb0057307d4..21ff7143a56b0ffa5d821acb94f35691a286233e 100644 (file)
--- a/config/user.m4
+++ b/config/user.m4
@@ -2,12 +2,36 @@ dnl #
 dnl # Default ZFS user configuration
 dnl #
 AC_DEFUN([ZFS_AC_CONFIG_USER], [
-       ZFS_AC_CONFIG_USER_ARCH
-       ZFS_AC_CONFIG_USER_IOCTL
+       ZFS_AC_CONFIG_USER_MOUNT_HELPER
+       ZFS_AC_CONFIG_USER_UDEV
+       ZFS_AC_CONFIG_USER_SYSTEMD
+       ZFS_AC_CONFIG_USER_SYSVINIT
+       ZFS_AC_CONFIG_USER_DRACUT
        ZFS_AC_CONFIG_USER_ZLIB
        ZFS_AC_CONFIG_USER_LIBUUID
+       ZFS_AC_CONFIG_USER_LIBTIRPC
        ZFS_AC_CONFIG_USER_LIBBLKID
-       ZFS_AC_CONFIG_USER_LIBSELINUX
+       ZFS_AC_CONFIG_USER_LIBATTR
+       ZFS_AC_CONFIG_USER_LIBUDEV
        ZFS_AC_CONFIG_USER_FRAME_LARGER_THAN
-       ZFS_AC_CONFIG_USER_STACK_GUARD
+       ZFS_AC_CONFIG_USER_RUNSTATEDIR
+       ZFS_AC_CONFIG_USER_MAKEDEV_IN_SYSMACROS
+       ZFS_AC_CONFIG_USER_MAKEDEV_IN_MKDEV
+       ZFS_AC_CONFIG_USER_NO_FORMAT_TRUNCATION
+
+       ZFS_AC_TEST_FRAMEWORK
+
+       AC_CHECK_FUNCS([mlockall])
+])
+
+dnl #
+dnl # Setup the environment for the ZFS Test Suite.  Currently only
+dnl # Linux sytle systems are supported but this infrastructure can
+dnl # be extended to support other platforms if needed.
+dnl #
+AC_DEFUN([ZFS_AC_TEST_FRAMEWORK], [
+       ZONENAME="echo global"
+       AC_SUBST(ZONENAME)
+
+       AC_SUBST(RM)
 ])