X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=configure.ac;h=f4d47b86ac282d423c7f7e599657c08e04d7bbb1;hp=96b4968a2874330b3135c8a0bb17549f76ac1403;hb=cfbeae97d736152e5bdf8f3e759a260f6ee903d8;hpb=25c93758d6b1136d268fe3fcc1c4979c17463c0b;ds=sidebyside

diff --git a/configure.ac b/configure.ac
index 96b4968..f4d47b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,27 +1,24 @@
 AC_PREREQ([2.57])
-AC_INIT([Lustre], [LUSTRE_VERSION], [http://bugs.whamcloud.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])
 
-# Overridden by --without-ldiskfs/--with-zfs configure options
-AM_CONDITIONAL(LDISKFS_ENABLED, true)
-AM_CONDITIONAL(ZFS_ENABLED, false)
-
-LB_CHECK_VERSION
-
 LC_CONFIG_SRCDIR
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE([1.10 tar-ustar -Wno-portability])
+AM_INIT_AUTOMAKE([1.10 tar-ustar -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