Add xattr_handler support for Android kernels

[mirror_zfs.git] / config / user.m4

diff --git a/config/user.m4 b/config/user.m4
index 69d103c1058ad3d54e8bd571ebc29f92a63056c7..a7241f44f1fd61625c05d592726c65e85203a97a 100644 (file)
--- a/config/user.m4
+++ b/config/user.m4
@@ -2,33 +2,36 @@ dnl #
 dnl # Default ZFS user configuration
 dnl #
 AC_DEFUN([ZFS_AC_CONFIG_USER], [
+       ZFS_AC_CONFIG_USER_GETTEXT
        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_ARCH
+       AM_COND_IF([BUILD_FREEBSD], [
+               PKG_INSTALLDIR(['${prefix}/libdata/pkgconfig'])], [
+               PKG_INSTALLDIR
+       ])
        ZFS_AC_CONFIG_USER_ZLIB
-       ZFS_AC_CONFIG_USER_LIBUUID
-       ZFS_AC_CONFIG_USER_LIBBLKID
-       ZFS_AC_CONFIG_USER_LIBATTR
-       ZFS_AC_CONFIG_USER_FRAME_LARGER_THAN
+       AM_COND_IF([BUILD_LINUX], [
+               ZFS_AC_CONFIG_USER_UDEV
+               ZFS_AC_CONFIG_USER_SYSTEMD
+               ZFS_AC_CONFIG_USER_LIBUUID
+               ZFS_AC_CONFIG_USER_LIBBLKID
+       ])
+       ZFS_AC_CONFIG_USER_LIBTIRPC
+       ZFS_AC_CONFIG_USER_LIBUDEV
+       ZFS_AC_CONFIG_USER_LIBCRYPTO
+       ZFS_AC_CONFIG_USER_LIBAIO
+       ZFS_AC_CONFIG_USER_LIBATOMIC
+       ZFS_AC_CONFIG_USER_LIBFETCH
+       ZFS_AC_CONFIG_USER_AIO_H
+       ZFS_AC_CONFIG_USER_CLOCK_GETTIME
+       ZFS_AC_CONFIG_USER_PAM
        ZFS_AC_CONFIG_USER_RUNSTATEDIR
+       ZFS_AC_CONFIG_USER_MAKEDEV_IN_SYSMACROS
+       ZFS_AC_CONFIG_USER_MAKEDEV_IN_MKDEV
+       ZFS_AC_CONFIG_USER_ZFSEXEC
 
-       ZFS_AC_CONFIG_USER_COMMANDS
-       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_CHECK_FUNCS([issetugid mlockall strlcat strlcpy])
 
        AC_SUBST(RM)
 ])