X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=configure.ac;h=2e8b8377751012dcd01073d8e5d1c7cda85b4767;hp=48e4d3c2cbf11b2ac86326a11f5d9168146f080b;hb=475576e74ec315e316fe6528c97c437511b18872;hpb=2cf42237b46747308e5ee10cf027fe93a97d3690

diff --git a/configure.ac b/configure.ac
index 48e4d3c..2e8b837 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,19 +1,24 @@
+AC_PREREQ([2.57])
+AC_INIT([Lustre], m4_esyscmd([sh -c "./LUSTRE-VERSION-GEN | tr -d '\n'"]),
+        [https://jira.hpdd.intel.com/], [lustre])
 
-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)
-
-LB_CHECK_VERSION
+AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([config])
 
 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
+AC_PROG_MKDIR_P
+AM_PROG_AS
+
+AC_PATH_PROG(RPMBUILD, rpmbuild)
+AC_CHECK_TOOLS(AR, ar)
 
+LUSTRE_VERSION_CPP_MACROS
 LB_CONFIGURE