X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=configure.ac;h=1e59a49deeef2687d142736dad1c886c0efc0bcb;hb=954c0ff7522b666b328c4a02caa8248a9116f0c9;hp=9574d0c6d8b12f8e055f0ca026a11c342ce4c9d2;hpb=5a562259fce98b15f519fab7dd8cb921e8445d7b;p=fs%2Flustre-release.git

diff --git a/configure.ac b/configure.ac
index 9574d0c..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
 
@@ -18,4 +19,6 @@ AC_PROG_CC
 
 AM_PROG_AS
 
+AC_CHECK_TOOLS(AR, ar)
+
 LB_CONFIGURE