X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=configure.ac;h=1e59a49deeef2687d142736dad1c886c0efc0bcb;hp=d74000492d1cdef4a0c64feafeab7026abd0f4d1;hb=31bd885113fbd8a1f666144b05009c09d89a3af8;hpb=f28cf26bddbda60587815d7a0eef7d75c46950c6

diff --git a/configure.ac b/configure.ac
index d740004..1e59a49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,9 @@
 AC_INIT([Lustre], [LUSTRE_VERSION], [http://bugs.whamcloud.com/], [lustre])
 sinclude(lustre/autoconf/lustre-version.ac)
 
-# Overridden in LB_PATH_LDISKFS on certain branches
-AM_CONDITIONAL(LDISKFS_ENABLED, false)
+# Overridden by --without-ldiskfs/--with-zfs configure options
+AM_CONDITIONAL(LDISKFS_ENABLED, true)
+AM_CONDITIONAL(ZFS_ENABLED, false)
 
 LB_CHECK_VERSION