X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=configure.ac;h=1fc11c953a997ebd6657cead45e934837d69f9de;hp=5ce60d792962b844ab78268cf65d4ddf227fcdca;hb=a77212cd13627b2b9f1835c48599e91c82aeed9d;hpb=e9a55d0396337bb31f08d06a520185cbe09aedd3

diff --git a/configure.ac b/configure.ac
index 5ce60d7..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,7 @@ LC_CONFIG_SRCDIR
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.9 tar-ustar])
 # AM_MAINTAINER_MODE
 
 AC_PROG_CC