X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=configure.ac;h=af63f99b5b42d09ed9df7021a5bd2b97b16baf4a;hb=refs%2Fchanges%2F22%2F48222%2F3;hp=0a008590fb2bd8d7bc808d721483661dee63d448;hpb=7e773a89d8bea8bd2a1680406bb3bd39d8050dbc;p=fs%2Flustre-release.git

diff --git a/configure.ac b/configure.ac
index 0a00859..af63f99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,24 +1,26 @@
 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_s([./LUSTRE-VERSION-GEN]),
+        [https://jira.whamcloud.com/], [lustre])
 
-# Overridden by --without-ldiskfs/--with-zfs configure options
-AM_CONDITIONAL(LDISKFS_ENABLED, true)
-AM_CONDITIONAL(ZFS_ENABLED, false)
-
-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([1.10 tar-ustar -Wno-portability])
-# 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