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

diff --git a/configure.ac b/configure.ac
index 9574d0c..96b4968 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,13 @@
-
+AC_PREREQ([2.57])
 AC_INIT([Lustre], [LUSTRE_VERSION], [http://bugs.whamcloud.com/], [lustre])
 sinclude(lustre/autoconf/lustre-version.ac)
 
-# Overridden in LB_PATH_LDISKFS on certain branches
-AM_CONDITIONAL(LDISKFS_ENABLED, false)
+AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([config])
+
+# Overridden by --without-ldiskfs/--with-zfs configure options
+AM_CONDITIONAL(LDISKFS_ENABLED, true)
+AM_CONDITIONAL(ZFS_ENABLED, false)
 
 LB_CHECK_VERSION
 
@@ -11,11 +15,13 @@ LC_CONFIG_SRCDIR
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE([1.9 tar-ustar])
-# AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE([1.10 tar-ustar -Wno-portability])
+AM_MAINTAINER_MODE([enable])
 
 AC_PROG_CC
 
 AM_PROG_AS
 
+AC_CHECK_TOOLS(AR, ar)
+
 LB_CONFIGURE