X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=configure.ac;h=1fc11c953a997ebd6657cead45e934837d69f9de;hp=7e8d2d3942d080b312219eba299a665f4ade48a5;hb=c4cb5e5f0e316f986eae3b11be4f5d81756b85b6;hpb=f64af1d45df2a76f97337b47259363f61fab6b5f

diff --git a/configure.ac b/configure.ac
index 7e8d2d3..1fc11c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,9 @@
-sinclude(lustre/autoconf/lustre-version.ac)
 
 AC_INIT([Lustre], [LUSTRE_VERSION], [https://bugzilla.lustre.org/], [lustre])
+sinclude(lustre/autoconf/lustre-version.ac)
+
+# Overridden in LB_PATH_LDISKFS on certain branches
+AM_CONDITIONAL(LDISKFS_ENABLED, false)
 
 LB_CHECK_VERSION
 
@@ -8,7 +11,9 @@ LC_CONFIG_SRCDIR
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.9 tar-ustar])
 # AM_MAINTAINER_MODE
 
+AC_PROG_CC
+
 LB_CONFIGURE