X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=configure.ac;h=9574d0c6d8b12f8e055f0ca026a11c342ce4c9d2;hp=ce1df2a829bc42d7202b11de212a1d54c46533f7;hb=2d617260aaa5f778ab8dcb006e2a827f4b8f8567;hpb=2ec4f8cc2c890edcd2199c92113438c8584b78b7

diff --git a/configure.ac b/configure.ac
index ce1df2a..9574d0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,45 +1,21 @@
-sinclude(lustre/version.m4)
 
-AC_INIT([Lustre], [LUSTRE_VERSION], [http://bugzilla.lustre.org/], [lustre])
+AC_INIT([Lustre], [LUSTRE_VERSION], [http://bugs.whamcloud.com/], [lustre])
+sinclude(lustre/autoconf/lustre-version.ac)
 
-if test "LUSTRE_VERSION" = "LUSTRE""_VERSION" ; then
-	cat >&2 <<-EOF
-	This script was not built with a version number.
+# Overridden in LB_PATH_LDISKFS on certain branches
+AM_CONDITIONAL(LDISKFS_ENABLED, false)
 
-	This is likely due to an incorrect checkout, or a broken
-	tarball.
+LB_CHECK_VERSION
 
-	Please see README.lustrecvs, or contact your Lustre vendor.
-	EOF
-	exit 1
-fi
+LC_CONFIG_SRCDIR
 
-AC_CONFIG_SRCDIR(lustre/obdclass/obdo.c)
-AM_INIT_AUTOMAKE
-# AM_MAINTAINER_MODE
-
-sinclude(build/build.ac)
-sinclude(portals/portals.ac)
-sinclude(lustre/lustre.ac)
-
-AC_CONFIG_HEADERS([config.h])
+AC_CANONICAL_SYSTEM
 
-CPPFLAGS="-include \$(top_builddir)/config.h $CPPFLAGS"
-EXTRA_KCFLAGS="-include $PWD/config.h $EXTRA_KCFLAGS"
-AC_SUBST(EXTRA_KCFLAGS)
-
-AC_OUTPUT([
-Makefile
-autoMakefile
-])
+AM_INIT_AUTOMAKE([1.9 tar-ustar])
+# AM_MAINTAINER_MODE
 
-cat <<EOF
+AC_PROG_CC
 
-CPPFLAGS: $CPPFLAGS
-LLCPPFLAGS: $LLCPPFLAGS
-CFLAGS: $CFLAGS
-EXTRA_KCFLAGS: $EXTRA_KCFLAGS
-LLCFLAGS: $LLCFLAGS
+AM_PROG_AS
 
-Type 'make' to build Lustre.
-EOF
+LB_CONFIGURE