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

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