aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2010-12-24 15:19:44 -0500
committerTheodore Ts'o <tytso@mit.edu>2010-12-24 15:19:44 -0500
commit8d9c50c5570c2c87a99fb68389cebdc782433f82 (patch)
tree3fafba20d66e0ab7abd61d34faea1fefc6f65aab
parentb07f014face2e2aa0abf8a3266fd716152cd0cd4 (diff)
downloade2fsprogs-8d9c50c5570c2c87a99fb68389cebdc782433f82.tar.gz
e2fsprogs-8d9c50c5570c2c87a99fb68389cebdc782433f82.tar.xz
e2fsprogs-8d9c50c5570c2c87a99fb68389cebdc782433f82.zip
configure: control whether e4defrag is built/installed via --disable-defrag
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-rwxr-xr-xconfigure24
-rw-r--r--configure.in18
-rw-r--r--misc/Makefile.in9
3 files changed, 47 insertions, 4 deletions
diff --git a/configure b/configure
index 2f5515aa..6dccb3ce 100755
--- a/configure
+++ b/configure
@@ -673,6 +673,7 @@ E2INITRD_MAN
E2INITRD_PROG
FSCK_MAN
FSCK_PROG
+DEFRAG_CMT
RESIZER_CMT
IMAGER_CMT
DEBUGFS_CMT
@@ -803,6 +804,7 @@ enable_libblkid
enable_debugfs
enable_imager
enable_resizer
+enable_defrag
enable_fsck
enable_e2initrd_helper
enable_tls
@@ -1454,6 +1456,7 @@ Optional Features:
--disable-debugfs disable support of debugfs program
--disable-imager disable support of e2image program
--disable-resizer disable support of e2resize program
+ --disable-defrag disable support of e4defrag program
--enable-fsck build fsck wrapper program
--enable-e2initrd-helper build e2initrd-helper program
--disable-tls disable use of thread local support
@@ -5396,6 +5399,27 @@ RESIZER_CMT=
fi
+# Check whether --enable-defrag was given.
+if test "${enable_defrag+set}" = set; then :
+ enableval=$enable_defrag; if test "$enableval" = "no"
+then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling e4defrag support" >&5
+$as_echo "Disabling e4defrag support" >&6; }
+ DEFRAG_CMT="#"
+else
+ DEFRAG_CMT=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling e4defrag support" >&5
+$as_echo "Enabling e4defrag support" >&6; }
+fi
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling e4defrag support by default" >&5
+$as_echo "Enabling e4defrag support by default" >&6; }
+DEFRAG_CMT=
+
+fi
+
+
# Check whether --enable-fsck was given.
if test "${enable_fsck+set}" = set; then :
enableval=$enable_fsck; if test "$enableval" = "no"
diff --git a/configure.in b/configure.in
index f9fffc18..af639c3f 100644
--- a/configure.in
+++ b/configure.in
@@ -577,6 +577,24 @@ RESIZER_CMT=
)
AC_SUBST(RESIZER_CMT)
dnl
+dnl handle --enable-defrag
+dnl
+AC_ARG_ENABLE([defrag],
+[ --disable-defrag disable support of e4defrag program],
+if test "$enableval" = "no"
+then
+ AC_MSG_RESULT([Disabling e4defrag support])
+ DEFRAG_CMT="#"
+else
+ DEFRAG_CMT=
+ AC_MSG_RESULT([Enabling e4defrag support])
+fi
+,
+AC_MSG_RESULT([Enabling e4defrag support by default])
+DEFRAG_CMT=
+)
+AC_SUBST(DEFRAG_CMT)
+dnl
dnl See whether to install the `fsck' wrapper program (that calls e2fsck)
dnl
AC_ARG_ENABLE([fsck],
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 8fd77049..86ee53f3 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -11,8 +11,8 @@ INSTALL = @INSTALL@
@MCONFIG@
-@LINUX_CMT@E4DEFRAG_PROG= e4defrag
-@LINUX_CMT@E4DEFRAG_MAN= e4defrag.8
+@DEFRAG_CMT@@LINUX_CMT@E4DEFRAG_PROG= e4defrag
+@DEFRAG_CMT@@LINUX_CMT@E4DEFRAG_MAN= e4defrag.8
@IMAGER_CMT@E2IMAGE_PROG= e2image
@IMAGER_CMT@E2IMAGE_MAN= e2image.8
@@ -28,10 +28,11 @@ INSTALL = @INSTALL@
SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \
$(E2IMAGE_PROG) @FSCK_PROG@ e2undo
-USPROGS= mklost+found filefrag e2freefrag $(UUIDD_PROG)
+USPROGS= mklost+found filefrag e2freefrag $(UUIDD_PROG) $(E4DEFRAG_PROG)
SMANPAGES= tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
e2label.8 $(FINDFS_MAN) $(BLKID_MAN) $(E2IMAGE_MAN) \
- logsave.8 filefrag.8 e2freefrag.8 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@
+ logsave.8 filefrag.8 e2freefrag.8 e2undo.8 \
+ $(UUIDD_MAN) $(E4DEFRAG_MAN) @FSCK_MAN@
FMANPAGES= mke2fs.conf.5
UPROGS= chattr lsattr @UUID_CMT@ uuidgen