X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=configure.ac;h=1e59a49deeef2687d142736dad1c886c0efc0bcb;hb=6c3606b79a4c25946255a680f79ff2d58df66bbc;hp=48e4d3c2cbf11b2ac86326a11f5d9168146f080b;hpb=2cf42237b46747308e5ee10cf027fe93a97d3690;p=fs%2Flustre-release.git

diff --git a/configure.ac b/configure.ac
index 48e4d3c..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
 
@@ -16,4 +17,8 @@ AM_INIT_AUTOMAKE([1.9 tar-ustar])
 
 AC_PROG_CC
 
+AM_PROG_AS
+
+AC_CHECK_TOOLS(AR, ar)
+
 LB_CONFIGURE