Whamcloud - gitweb
LU-8465 configure: enable pfsck by default 21/40021/7
authorWang Shilong <wshilong@ddn.com>
Thu, 24 Sep 2020 00:16:13 +0000 (08:16 +0800)
committerAndreas Dilger <adilger@whamcloud.com>
Sun, 27 Sep 2020 05:18:59 +0000 (05:18 +0000)
Since most of work has been done, compile e2fsprogs
with pfsck enabled by default.

So it could testing widely now.

Signed-off-by: Wang Shilong <wshilong@ddn.com>
Change-Id: I7fe31e0d8161132ea1717f0d7e5f4fe0db432fec
Reviewed-on: https://review.whamcloud.com/40021
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
configure
configure.ac

index 04b73b9..8815311 100755 (executable)
--- a/configure
+++ b/configure
@@ -1586,7 +1586,7 @@ Optional Features:
   --disable-tdb           disable tdb support
   --disable-bmap-stats    disable collection of bitmap stats.
   --enable-bmap-stats-ops enable collection of additional bitmap stats
-  --enable-pfsck     enable parallel e2fsck
+  --disable-pfsck     disable parallel e2fsck
   --disable-nls           do not use Native Language Support
   --enable-threads={posix|solaris|pth|windows}
                           specify multithreading API
@@ -6142,8 +6142,17 @@ $as_echo "Enabling parallel e2fsck" >&6; }
 fi
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling parallel e2fsck" >&5
+  if test -z "PTHREAD_LIB"
+then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling parallel e2fsck" >&5
 $as_echo "Disabling parallel e2fsck" >&6; }
+else
+
+$as_echo "#define CONFIG_PFSCK 1" >>confdefs.h
+
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling parallel e2fsck by default" >&5
+$as_echo "Enabling parallel e2fsck by default" >&6; }
+fi
 
 fi
 
index c06865a..a859593 100644 (file)
@@ -856,13 +856,13 @@ fi
 AC_MSG_RESULT([Disabling additional bitmap statistics by default])
 )
 dnl
-dnl handle --enable-pfsck
+dnl handle --disable-pfsck
 dnl
 PTHREAD_LIB=''
 AC_CHECK_LIB(pthread,pthread_join,PTHREAD_LIB=-pthread)
 AC_SUBST(PTHREAD_LIB)
 AC_ARG_ENABLE([pfsck],
-[  --enable-pfsck     enable parallel e2fsck],
+[  --disable-pfsck     disable parallel e2fsck],
 if test "$enableval" = "no" || test -z "PTHREAD_LIB"
 then
        AC_MSG_RESULT([Disabling parallel e2fsck])
@@ -872,7 +872,14 @@ else
        AC_MSG_RESULT([Enabling parallel e2fsck])
 fi
 ,
-AC_MSG_RESULT([Disabling parallel e2fsck])
+if test -z "PTHREAD_LIB"
+then
+       AC_MSG_RESULT([Disabling parallel e2fsck])
+else
+       AC_DEFINE(CONFIG_PFSCK, 1,
+               [Define to 1 if parallel e2fsck is enabled])
+       AC_MSG_RESULT([Enabling parallel e2fsck by default])
+fi
 )
 dnl
 dnl