-# Overridden in LB_PATH_LDISKFS on certain branches
-AM_CONDITIONAL(LDISKFS_ENABLED, false)
+AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([config])
+
+# Overridden by --without-ldiskfs/--with-zfs configure options
+AM_CONDITIONAL(LDISKFS_ENABLED, true)
+AM_CONDITIONAL(ZFS_ENABLED, false)