From d8feaf41d60bb96c9555a84fa846703f4707cb78 Mon Sep 17 00:00:00 2001 From: Niu Yawei Date: Mon, 11 Jun 2012 06:33:55 -0700 Subject: [PATCH] LU-1502 build: enable quota when building The quota support is disabled by default, but we need to enable it explicitly when build e2fsprogs for Lustre 2.4. Signed-off-by: Niu Yawei Change-Id: Ic09f7c100b254559a5223460242b3bf465ff0802 --- configure | 12 ++++++++---- configure.in | 9 ++++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 97493d9..910ecb1 100755 --- a/configure +++ b/configure @@ -1501,7 +1501,7 @@ Optional Features: --disable-testio-debug disable the use of the test I/O manager for debugging --disable-libuuid do not build private uuid library --disable-libblkid do not build private blkid library - --enable-quota enable quota support + --disable-quota disable quota support --disable-backtrace disable use backtrace --disable-debugfs disable support of debugfs program --disable-e2scan disable support of e2scan program @@ -5314,10 +5314,12 @@ then QUOTA_CMT=# { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling quota support" >&5 $as_echo "Disabling quota support" >&6; } + QUOTA_CMT="#" else QUOTA_CMT= $as_echo "#define CONFIG_QUOTA 1" >>confdefs.h + QUOTA_CMT= { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling quota support" >&5 $as_echo "Enabling quota support" >&6; } QUOTA_MAN_COMMENT="" @@ -5325,9 +5327,11 @@ $as_echo "Enabling quota support" >&6; } fi else - QUOTA_CMT=# -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling quota support by default" >&5 -$as_echo "Disabling quota support by default" >&6; } + $as_echo "#define CONFIG_QUOTA 1" >>confdefs.h + +QUOTA_CMT= +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling quota support by default" >&5 +$as_echo "Enabling quota support by default" >&6; } fi diff --git a/configure.in b/configure.in index 05cfbdf..ffb014e 100644 --- a/configure.in +++ b/configure.in @@ -569,21 +569,24 @@ AC_SUBST(QUOTA_MAN_COMMENT) PKG_PROG_PKG_CONFIG AH_TEMPLATE([CONFIG_QUOTA], [Define to 1 to enable quota support]) AC_ARG_ENABLE([quota], -[ --enable-quota enable quota support], +[ --disable-quota disable quota support], if test "$enableval" = "no" then QUOTA_CMT=# AC_MSG_RESULT([Disabling quota support]) + QUOTA_CMT="#" else QUOTA_CMT= AC_DEFINE(CONFIG_QUOTA, 1) + QUOTA_CMT= AC_MSG_RESULT([Enabling quota support]) QUOTA_MAN_COMMENT="" AC_SUBST(QUOTA_MAN_COMMENT) fi , -QUOTA_CMT=# -AC_MSG_RESULT([Disabling quota support by default]) +AC_DEFINE(CONFIG_QUOTA, 1) +QUOTA_CMT= +AC_MSG_RESULT([Enabling quota support by default]) ) dnl dnl Define stuff expected for quota library -- 1.8.3.1