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

diff --git a/configure.ac b/configure.ac
index c6219c5..af63f99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,25 +1,26 @@
 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_s([./LUSTRE-VERSION-GEN]),
+        [https://jira.whamcloud.com/], [lustre])
 
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([config])
 
-LB_CHECK_VERSION
-
 LC_CONFIG_SRCDIR
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_TARGET
 
-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
-AC_PROG_LIBTOOL
+LT_INIT
 AC_PROG_MKDIR_P
 AM_PROG_AS
 
+AC_PATH_PROG(FLEX, flex)
+AC_PATH_PROG(BISON, bison)
 AC_PATH_PROG(RPMBUILD, rpmbuild)
 AC_CHECK_TOOLS(AR, ar)
 
+LUSTRE_VERSION_CPP_MACROS
 LB_CONFIGURE