Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-911 ost: ost_handle() to refill environment on every requests
[fs/lustre-release.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
ce1df2a
..
48e4d3c
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,45
+1,19
@@
-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
-])
-
-cat <<EOF
+AM_INIT_AUTOMAKE([1.9 tar-ustar])
+# AM_MAINTAINER_MODE
-CPPFLAGS: $CPPFLAGS
-LLCPPFLAGS: $LLCPPFLAGS
-CFLAGS: $CFLAGS
-EXTRA_KCFLAGS: $EXTRA_KCFLAGS
-LLCFLAGS: $LLCFLAGS
+AC_PROG_CC
-Type 'make' to build Lustre.
-EOF
+LB_CONFIGURE