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

diff --git a/configure.ac b/configure.ac
index 5ce60d7..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,9 +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