X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=configure.ac;h=16e9ee8e3841c787a2db200f3558c6b76cd160c7;hp=c6219c5d4126bc4db5dac8fc8f1aac0bac6ca67c;hb=ab0a6a9a066a7b175ff48b9b679ba0fb59416f9b;hpb=a71ab04971382c77f708d6a082e8ee2fa845e9be

diff --git a/configure.ac b/configure.ac
index c6219c5..16e9ee8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,17 +1,15 @@
 AC_PREREQ([2.57])
-AC_INIT([Lustre], [LUSTRE_VERSION], [https://jira.hpdd.intel.com/], [lustre])
-sinclude(lustre/autoconf/lustre-version.ac)
+AC_INIT([Lustre], m4_esyscmd([sh -c "./LUSTRE-VERSION-GEN | tr -d '\n'"]),
+        [https://jira.whamcloud.com/], [lustre])
 
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([config])
 
-LB_CHECK_VERSION
-
 LC_CONFIG_SRCDIR
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE([1.10 tar-ustar -Wno-portability])
+AM_INIT_AUTOMAKE([1.10 tar-pax -Wno-portability subdir-objects])
 AM_MAINTAINER_MODE([enable])
 
 AC_PROG_CC
@@ -22,4 +20,5 @@ AM_PROG_AS
 AC_PATH_PROG(RPMBUILD, rpmbuild)
 AC_CHECK_TOOLS(AR, ar)
 
+LUSTRE_VERSION_CPP_MACROS
 LB_CONFIGURE