X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=configure.ac;h=4000a38aa8c4ef9bc267dbf03cd04786a0747075;hb=1949400a8843a6852fa9661f3dafa7d471144742;hp=1e59a49deeef2687d142736dad1c886c0efc0bcb;hpb=b670e44c791c009855a35d1b329a4e2b15cf5c28;p=fs%2Flustre-release.git

diff --git a/configure.ac b/configure.ac
index 1e59a49..4000a38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,24 +1,36 @@
+# SPDX-License-Identifier: GPL-2.0
 
-AC_INIT([Lustre], [LUSTRE_VERSION], [http://bugs.whamcloud.com/], [lustre])
-sinclude(lustre/autoconf/lustre-version.ac)
+#
+# This file is part of Lustre, http://www.lustre.org/
+#
+# configure.ac
+#
+# Used by autoconf to create the configure script
+#
 
-# Overridden by --without-ldiskfs/--with-zfs configure options
-AM_CONDITIONAL(LDISKFS_ENABLED, true)
-AM_CONDITIONAL(ZFS_ENABLED, false)
+AC_PREREQ([2.57])
+AC_INIT([Lustre], m4_esyscmd_s([./LUSTRE-VERSION-GEN]),
+	[https://jira.whamcloud.com/], [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([1.9 tar-ustar])
-# AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE([1.10 tar-pax -Wno-portability subdir-objects])
+AM_MAINTAINER_MODE([enable])
 
-AC_PROG_CC
+LTC_TOOLCHAIN_CONFIGURE
+LT_INIT
+AC_PROG_MKDIR_P
 
-AM_PROG_AS
-
-AC_CHECK_TOOLS(AR, ar)
+AC_PATH_PROG(FLEX, flex)
+AC_PATH_PROG(BISON, bison)
+AC_PATH_PROG(RPMBUILD, rpmbuild)
+AC_PATH_PROG(PKGCONF, pkg-config)
 
+LUSTRE_VERSION_CPP_MACROS
 LB_CONFIGURE
+LTC_TOOLCHAIN_STATUS