mke2fs: remove quota docs if not configured in

If quota isn't turned on with --enable-quota, then comment
quota documentation out of the mke2fs manpage.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/configure b/configure
index 4c47f7a86af571ff43fff08e13e80cfaf5cb7c20..afe381fc863c5c0554973da76416d66f1a61fd84 100755 (executable)
--- a/configure
+++ b/configure
@@ -715,6 +715,7 @@ DEPSTATIC_LIBQUOTA
 STATIC_LIBQUOTA
 DEPLIBQUOTA
 LIBQUOTA
+QUOTA_MAN_COMMENT
 BLKID_CMT
 DEPPROFILED_LIBBLKID
 PROFILED_LIBBLKID
@@ -5185,6 +5186,8 @@ fi
 
 
 
+QUOTA_MAN_COMMENT='.\"'
+
 
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -5313,6 +5316,8 @@ else
 
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling quota support" >&5
 $as_echo "Enabling quota support" >&6; }
+       QUOTA_MAN_COMMENT=""
+
 fi
 
 else

diff --git a/configure.in b/configure.in
index fc65b03acd9e4e0d906fd7ad25e0cf1d02976970..f9cfd5348aae6acbb945dcc158b7b1875d6c55e3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -565,6 +565,8 @@ AC_SUBST(BLKID_CMT)
 dnl
 dnl handle --enable-quota
 dnl
+QUOTA_MAN_COMMENT='.\"'
+AC_SUBST(QUOTA_MAN_COMMENT)
 PKG_PROG_PKG_CONFIG
 AH_TEMPLATE([CONFIG_QUOTA], [Define to 1 to enable quota support])
 AC_ARG_ENABLE([quota],
@@ -575,6 +577,8 @@ then
 else
        AC_DEFINE(CONFIG_QUOTA, 1)
        AC_MSG_RESULT([Enabling quota support])
+       QUOTA_MAN_COMMENT=""
+       AC_SUBST(QUOTA_MAN_COMMENT)
 fi
 ,
 AC_MSG_RESULT([Disabling quota support by default])

diff --git a/misc/mke2fs.8.in b/misc/mke2fs.8.in
index fe2dcdbd3ba639c765f0d2b2266a0dceb4e8854a..7d2f0f7009542c23c7b2691ec1a6c209ab7c5fc2 100644 (file)
--- a/misc/mke2fs.8.in
+++ b/misc/mke2fs.8.in
@@ -291,13 +291,13 @@ as default.
 .TP
 .BI nodiscard
 Do not attempt to discard blocks at mkfs time.
-.TP
-.BI quotatype
-Specify which quota type ('usr' or 'grp') is to be initialized. This
-option has any effect only if
-.B quota
-feature is set. Without this extended option, the default behavior is to
-initialize both user and group quotas.
+@QUOTA_MAN_COMMENT@.TP
+@QUOTA_MAN_COMMENT@.BI quotatype
+@QUOTA_MAN_COMMENT@Specify which quota type ('usr' or 'grp') is to be initialized. This
+@QUOTA_MAN_COMMENT@option has any effect only if
+@QUOTA_MAN_COMMENT@.B quota
+@QUOTA_MAN_COMMENT@feature is set. Without this extended option, the default behavior is to
+@QUOTA_MAN_COMMENT@initialize both user and group quotas.
 .RE
 .TP
 .BI \-f " fragment-size"
@@ -590,11 +590,11 @@ option).
 .B large_file
 Filesystem can contain files that are greater than 2GB.  (Modern kernels
 set this feature automatically when a file > 2GB is created.)
-.TP
-.B quota
-Create quota inodes (inode# 3 for userquota and inode# 4 for group quota) and
-set them in the superblock.  With this feature, the quotas will be enabled
-automatically when the filesystem is mounted.
+@QUOTA_MAN_COMMENT@.TP
+@QUOTA_MAN_COMMENT@.B quota
+@QUOTA_MAN_COMMENT@Create quota inodes (inode# 3 for userquota and inode# 4 for group quota) and
+@QUOTA_MAN_COMMENT@set them in the superblock.  With this feature, the quotas will be enabled
+@QUOTA_MAN_COMMENT@automatically when the filesystem is mounted.
 .TP
 .B resize_inode
 Reserve space so the block group descriptor table may grow in the future.

diff --git a/util/subst.conf.in b/util/subst.conf.in
index 0e074d8547faa5e4b7d197d40110592da3b1cf3e..64fde7ad0dce55dceeb5a41c1a77c08cca3056fa 100644 (file)
--- a/util/subst.conf.in
+++ b/util/subst.conf.in
@@ -18,3 +18,5 @@ $prefix                       @prefix@
 # Enable the documentation for the journal device mke2fs, tune2fs, and
 # e2fsck's man page
 JDEV                   
+# Enable documentation for quota feature in mke2fs
+QUOTA_MAN_COMMENT      @QUOTA_MAN_COMMENT@