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
Restore build after a tag crossed imaginary line. tag 2.3.56
[fs/lustre-release.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
9574d0c
..
1e59a49
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-2,8
+2,9
@@
AC_INIT([Lustre], [LUSTRE_VERSION], [http://bugs.whamcloud.com/], [lustre])
sinclude(lustre/autoconf/lustre-version.ac)
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)
+# Overridden by --without-ldiskfs/--with-zfs configure options
+AM_CONDITIONAL(LDISKFS_ENABLED, true)
+AM_CONDITIONAL(ZFS_ENABLED, false)
LB_CHECK_VERSION
LB_CHECK_VERSION
@@
-18,4
+19,6
@@
AC_PROG_CC
AM_PROG_AS
AM_PROG_AS
+AC_CHECK_TOOLS(AR, ar)
+
LB_CONFIGURE
LB_CONFIGURE