LU-1502 build: enable quota when building

The quota feature is disabled by default, we should enable it
explicitly when build e2fsprogs.

Signed-off-by: Niu Yawei <niu@whamcloud.com>
Change-Id: Ic09f7c100b254559a5223460242b3bf465ff0802

diff --git a/configure b/configure
index 5e73d06..2eb8861 100755 (executable)
--- a/configure
+++ b/configure
@@ -1479,7 +1479,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-libquota      enable quota support
+  --disable-libquota     disable quota support
   --disable-debugfs      disable support of debugfs program
   --disable-e2scan       disable support of e2scan program
   --disable-imager       disable support of e2image program
@@ -5350,16 +5350,21 @@ if test "${enable_quota+set}" = set; then :
 then
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling quota support" >&5
 $as_echo "Disabling quota support" >&6; }
+       QUOTA_CMT="#"
 else
        $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; }
 fi
 
 else
-  { $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 a6e1ba4..46f7675 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -605,16 +605,20 @@ dnl
 PKG_PROG_PKG_CONFIG
 AH_TEMPLATE([CONFIG_QUOTA], [Define to 1 to enable quota support])
 AC_ARG_ENABLE([quota],
-[  --enable-libquota     enable quota support],
+[  --disable-libquota    disable quota support],
 if test "$enableval" = "no"
 then
        AC_MSG_RESULT([Disabling quota support])
+       QUOTA_CMT="#"
 else
        AC_DEFINE(CONFIG_QUOTA, 1)
+       QUOTA_CMT=
        AC_MSG_RESULT([Enabling quota support])
 fi
 ,
-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

diff --git a/e2fsprogs-RHEL-6.spec.in b/e2fsprogs-RHEL-6.spec.in
index 33e7665..287f5dd 100644 (file)
--- a/e2fsprogs-RHEL-6.spec.in
+++ b/e2fsprogs-RHEL-6.spec.in
@@ -157,7 +157,7 @@ It was originally inspired by the Multics SubSystem library.
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-uuidd --disable-fsck \
           --disable-e2initrd-helper --disable-libblkid --disable-libuuid \
-          --disable-defrag --enable-symlink-install \
+          --disable-defrag --enable-symlink-install --enable-quota \
           @WITH_LUSTRE@ @ENABLE_LFSCK@ \
           %{?extra_config_flags:%extra_config_flags}
 make %{?_smp_mflags}

diff --git a/e2fsprogs-SUSE_LINUX-11.spec.in b/e2fsprogs-SUSE_LINUX-11.spec.in
index 8336018..5c74221 100644 (file)
--- a/e2fsprogs-SUSE_LINUX-11.spec.in
+++ b/e2fsprogs-SUSE_LINUX-11.spec.in
@@ -172,6 +172,7 @@ autoreconf --force --install
   --disable-libuuid \
   --disable-uuidd \
   --disable-fsck \
+  --enable-quota \
   @WITH_LUSTRE@ @ENABLE_LFSCK@ \
   %{?extra_config_flags:%extra_config_flags} CFLAGS="$RPM_OPT_FLAGS"
 make V=1

diff --git a/e2fsprogs.spec.in b/e2fsprogs.spec.in
index d4d3db9..d6b5630 100644 (file)
--- a/e2fsprogs.spec.in
+++ b/e2fsprogs.spec.in
@@ -75,7 +75,7 @@ SMP systems.
 %setup
 
 %build
-%configure --enable-elf-shlibs --enable-nls --disable-defrag \
+%configure --enable-elf-shlibs --enable-nls --disable-defrag --enable-quota \
        @WITH_LUSTRE@ @ENABLE_LFSCK@ \
        %{?extra_config_flags:%extra_config_flags}
 make