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

diff --git a/configure.ac b/configure.ac
index 9574d0c..16e9ee8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,21 +1,24 @@
+AC_PREREQ([2.57])
+AC_INIT([Lustre], m4_esyscmd([sh -c "./LUSTRE-VERSION-GEN | tr -d '\n'"]),
+        [https://jira.whamcloud.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-pax -Wno-portability subdir-objects])
+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