+AC_PREREQ([2.57])
+AC_INIT([Lustre], m4_esyscmd_s([./LUSTRE-VERSION-GEN]),
+ [https://jira.whamcloud.com/], [lustre])
-AC_INIT([Lustre], [LUSTRE_VERSION], [http://bugs.whamcloud.com/], [lustre])
-sinclude(lustre/autoconf/lustre-version.ac)
-
-# Overridden in LB_PATH_LDISKFS on certain branches
-AM_CONDITIONAL(LDISKFS_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.9 tar-ustar])
-# 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