LU-479 sanity 124a failed

[fs/lustre-release.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7e8d2d3..1fc11c9 100644 (file)
--- 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])
 
 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
 
 
 LB_CHECK_VERSION
 


@@ -8,7 +11,9 @@ LC_CONFIG_SRCDIR
 
 AC_CANONICAL_SYSTEM
 
 
 AC_CANONICAL_SYSTEM
 

-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.9 tar-ustar])

 # AM_MAINTAINER_MODE
 
 # AM_MAINTAINER_MODE
 

+AC_PROG_CC
+

 LB_CONFIGURE
 LB_CONFIGURE