X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=af63f99b5b42d09ed9df7021a5bd2b97b16baf4a;hb=eaae4655567b16260237764dadb7ab57df8b0edd;hp=5ce60d792962b844ab78268cf65d4ddf227fcdca;hpb=e9a55d0396337bb31f08d06a520185cbe09aedd3;p=fs%2Flustre-release.git

diff --git a/configure.ac b/configure.ac
index 5ce60d7..af63f99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,16 +1,26 @@
-sinclude(lustre/autoconf/lustre-version.ac)
+AC_PREREQ([2.57])
+AC_INIT([Lustre], m4_esyscmd_s([./LUSTRE-VERSION-GEN]),
+        [https://jira.whamcloud.com/], [lustre])
 
-AC_INIT([Lustre], [LUSTRE_VERSION], [https://bugzilla.lustre.org/], [lustre])
-
-LB_CHECK_VERSION
+AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([config])
 
 LC_CONFIG_SRCDIR
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_TARGET
 
-AM_INIT_AUTOMAKE
-# AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE([1.10 tar-pax -Wno-portability subdir-objects])
+AM_MAINTAINER_MODE([enable])
 
 AC_PROG_CC
+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