LU-1199 build: Simplify autotools version checks

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

diff --git a/configure.ac b/configure.ac
index 889fe34..0a00859 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,16 +1,24 @@
-
-AC_INIT([Lustre], [LUSTRE_VERSION], [https://bugzilla.lustre.org/], [lustre])
+AC_PREREQ([2.57])
+AC_INIT([Lustre], [LUSTRE_VERSION], [http://bugs.whamcloud.com/], [lustre])
 sinclude(lustre/autoconf/lustre-version.ac)
 
+# Overridden by --without-ldiskfs/--with-zfs configure options
+AM_CONDITIONAL(LDISKFS_ENABLED, true)
+AM_CONDITIONAL(ZFS_ENABLED, false)
+
 LB_CHECK_VERSION
 
 LC_CONFIG_SRCDIR
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.10 tar-ustar -Wno-portability])
 # AM_MAINTAINER_MODE
 
 AC_PROG_CC
 
+AM_PROG_AS
+
+AC_CHECK_TOOLS(AR, ar)
+
 LB_CONFIGURE