Fix false ENOENT on snapshot control dentries

[zfs.git] / config / zfs-build.m4

diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
index c5983d3..8e6b13b 100644 (file)
--- a/config/zfs-build.m4
+++ b/config/zfs-build.m4
@@ -37,6 +37,29 @@ AC_DEFUN([ZFS_AC_DEBUG], [
        AC_MSG_RESULT([$enable_debug])
 ])
 
+AC_DEFUN([ZFS_AC_DEBUG_DMU_TX], [
+       AC_ARG_ENABLE([debug-dmu-tx],
+               [AS_HELP_STRING([--enable-debug-dmu-tx],
+               [Enable dmu tx validation @<:@default=no@:>@])],
+               [],
+               [enable_debug_dmu_tx=no])
+
+       AS_IF([test "x$enable_debug_dmu_tx" = xyes],
+       [
+               KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG_DMU_TX"
+               DEBUG_DMU_TX="_with_debug_dmu_tx"
+               AC_DEFINE([DEBUG_DMU_TX], [1],
+               [Define to 1 to enabled dmu tx validation])
+       ],
+       [
+               DEBUG_DMU_TX="_without_debug_dmu_tx"
+       ])
+
+       AC_SUBST(DEBUG_DMU_TX)
+       AC_MSG_CHECKING([whether dmu tx validation is enabled])
+       AC_MSG_RESULT([$enable_debug_dmu_tx])
+])
+
 AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [
        ZFS_AC_CONFIG_ALWAYS_NO_UNUSED_BUT_SET_VARIABLE
 ])
@@ -50,6 +73,11 @@ AC_DEFUN([ZFS_AC_CONFIG], [
                AS_HELP_STRING([--with-config=CONFIG],
                [Config file 'kernel|user|all|srpm']),
                [ZFS_CONFIG="$withval"])
+       AC_ARG_ENABLE([linux-builtin],
+               [AC_HELP_STRING([--enable-linux-builtin],
+               [Configure for builtin in-tree kernel modules @<:@default=no@:>@])],
+               [],
+               [enable_linux_builtin=no])
 
        AC_MSG_CHECKING([zfs config])
        AC_MSG_RESULT([$ZFS_CONFIG]);
@@ -70,11 +98,10 @@ AC_DEFUN([ZFS_AC_CONFIG], [
        esac
 
        AM_CONDITIONAL([CONFIG_USER],
-                      [test "$ZFS_CONFIG" = user] ||
-                      [test "$ZFS_CONFIG" = all])
+                      [test "$ZFS_CONFIG" = user -o "$ZFS_CONFIG" = all])
        AM_CONDITIONAL([CONFIG_KERNEL],
-                      [test "$ZFS_CONFIG" = kernel] ||
-                      [test "$ZFS_CONFIG" = all])
+                      [test "$ZFS_CONFIG" = kernel -o "$ZFS_CONFIG" = all] &&
+                      [test "x$enable_linux_builtin" != xyes ])
 ])
 
 dnl #