LU-4579 ldlm: Properly display time on lock timeout

[fs/lustre-release.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index aec60ab..b772a0f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,9 +2,8 @@ AC_PREREQ([2.57])
 AC_INIT([Lustre], [LUSTRE_VERSION], [http://bugs.whamcloud.com/], [lustre])
 sinclude(lustre/autoconf/lustre-version.ac)
 
-# Overridden by --without-ldiskfs/--with-zfs configure options
-AM_CONDITIONAL(LDISKFS_ENABLED, true)
-AM_CONDITIONAL(ZFS_ENABLED, false)
+AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([config])
 
 LB_CHECK_VERSION
 
@@ -16,6 +15,7 @@ AM_INIT_AUTOMAKE([1.10 tar-ustar -Wno-portability])
 AM_MAINTAINER_MODE([enable])
 
 AC_PROG_CC
+AC_PROG_LIBTOOL
 
 AM_PROG_AS