X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=configure.ac;h=b772a0f28e8a229db24f0988ac17f55c5ca57c99;hb=47cde804ddc9019ff0793229030211d536d0612f;hp=2b96a975016ccedefeb2ffd555d6c0ac43d95c40;hpb=a8b41fbb3d02b80a9bee60a550395364b4dc51e7;p=fs%2Flustre-release.git

diff --git a/configure.ac b/configure.ac
index 2b96a97..b772a0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,9 @@
-
+AC_PREREQ([2.57])
 AC_INIT([Lustre], [LUSTRE_VERSION], [http://bugs.whamcloud.com/], [lustre])
 sinclude(lustre/autoconf/lustre-version.ac)
 
-# Overridden by --with-ldiskfs/--with-zfs configure options
-AM_CONDITIONAL(LDISKFS_ENABLED, true)
-AM_CONDITIONAL(ZFS_ENABLED, false)
+AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([config])
 
 LB_CHECK_VERSION
 
@@ -12,10 +11,11 @@ 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
+AC_PROG_LIBTOOL
 
 AM_PROG_AS