summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarel Zak2013-04-10 22:38:54 +0200
committerKarel Zak2013-04-10 22:38:54 +0200
commit834fc88cd40cb81e076dcb87628e6aac9ec43d0f (patch)
tree22927cc9f1e79cada846bc6f498128a99f776061
parentbuild-sys: add --disable-cytune (diff)
downloadkernel-qcow2-util-linux-834fc88cd40cb81e076dcb87628e6aac9ec43d0f.tar.gz
kernel-qcow2-util-linux-834fc88cd40cb81e076dcb87628e6aac9ec43d0f.tar.xz
kernel-qcow2-util-linux-834fc88cd40cb81e076dcb87628e6aac9ec43d0f.zip
build-sys: add --disable-bfs
Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r--bash-completion/Makemodule.am5
-rw-r--r--configure.ac8
-rw-r--r--disk-utils/Makemodule.am2
3 files changed, 14 insertions, 1 deletions
diff --git a/bash-completion/Makemodule.am b/bash-completion/Makemodule.am
index fc7d9f274..14e0e6136 100644
--- a/bash-completion/Makemodule.am
+++ b/bash-completion/Makemodule.am
@@ -18,7 +18,6 @@ dist_bashcompletion_DATA = \
bash-completion/look \
bash-completion/mcookie \
bash-completion/mkfs \
- bash-completion/mkfs.bfs \
bash-completion/mkfs.minix \
bash-completion/mkswap \
bash-completion/namei \
@@ -35,6 +34,10 @@ dist_bashcompletion_DATA = \
bash-completion/wipefs
# disk-utils...
+if BUILD_BFS
+dist_bashcompletion_DATA += \
+ bash-completion/mkfs.bfs
+endif
if BUILD_CRAMFS
dist_bashcompletion_DATA += \
bash-completion/fsck.cramfs \
diff --git a/configure.ac b/configure.ac
index 7d1f56738..e21b17cc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -958,6 +958,14 @@ UL_REQUIRES_HAVE([cramfs], [z], [z library])
AM_CONDITIONAL(BUILD_CRAMFS, test "x$build_cramfs" = xyes)
+AC_ARG_ENABLE([BUILD_BFS],
+ AS_HELP_STRING([--disable-bfs], [do not build mkfs.bfs]),
+ [], enable_bfs=yes
+)
+UL_BUILD_INIT([bfs])
+AM_CONDITIONAL(BUILD_BFS, test "x$build_bfs" = xyes)
+
+
if test "x$have_io" = xyes -o "x$linux_os" = xyes; then
build_hwclock=yes
fi
diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am
index 22d066bfc..4e3284745 100644
--- a/disk-utils/Makemodule.am
+++ b/disk-utils/Makemodule.am
@@ -22,11 +22,13 @@ dist_man_MANS += disk-utils/isosize.8
isosize_SOURCES = disk-utils/isosize.c
isosize_LDADD = $(LDADD) libcommon.la
+if BUILD_BFS
sbin_PROGRAMS += mkfs.bfs
dist_man_MANS += disk-utils/mkfs.bfs.8
mkfs_bfs_SOURCES = \
disk-utils/mkfs.bfs.c
mkfs_bfs_LDADD = $(LDADD) libcommon.la
+endif
sbin_PROGRAMS += mkswap
dist_man_MANS += disk-utils/mkswap.8