From: Karel Zak <kzak@redhat.com>
Date: Wed, 10 Apr 2013 21:03:20 +0000 (+0200)
Subject: build-sys: add --disable-fdformat
X-Git-Tag: v2.23-rc2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d6f0baee9035f4188e223ebb8b7c437e88a1ed4;p=thirdparty%2Futil-linux.git

build-sys: add --disable-fdformat

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/bash-completion/Makemodule.am b/bash-completion/Makemodule.am
index 14e0e61367..371aaf5067 100644
--- a/bash-completion/Makemodule.am
+++ b/bash-completion/Makemodule.am
@@ -62,11 +62,14 @@ if BUILD_SWAPLABEL
 dist_bashcompletion_DATA += \
 	bash-completion/swaplabel
 endif
-if LINUX
+if BUILD_FDFORMAT
 dist_bashcompletion_DATA += \
-	bash-completion/blockdev \
 	bash-completion/fdformat
 endif
+if LINUX
+dist_bashcompletion_DATA += \
+	bash-completion/blockdev
+endif
 # ...disk-utils
 
 # fdisks...
diff --git a/configure.ac b/configure.ac
index 84148abd3e..fec2e4d790 100644
--- a/configure.ac
+++ b/configure.ac
@@ -958,7 +958,7 @@ UL_REQUIRES_HAVE([cramfs], [z], [z library])
 AM_CONDITIONAL(BUILD_CRAMFS, test "x$build_cramfs" = xyes)
 
 
-AC_ARG_ENABLE([BUILD_BFS],
+AC_ARG_ENABLE([bfs],
   AS_HELP_STRING([--disable-bfs], [do not build mkfs.bfs]),
   [], enable_bfs=yes
 )
@@ -966,6 +966,15 @@ UL_BUILD_INIT([bfs])
 AM_CONDITIONAL(BUILD_BFS, test "x$build_bfs" = xyes)
 
 
+AC_ARG_ENABLE([fdformat],
+  AS_HELP_STRING([--disable-fdformat], [do not build fdformat]),
+  [], enable_fdformat=yes
+)
+UL_BUILD_INIT([fdformat])
+UL_REQUIRES_LINUX([fdformat])
+AM_CONDITIONAL(BUILD_FDFORMAT, test "x$build_fdformat" = xyes)
+
+
 AC_ARG_ENABLE([hwclock],
   AS_HELP_STRING([--disable-hwclock], [do not build hwclock]),
   [], enable_hwclock=check
diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am
index 4e32847459..def18c7f5c 100644
--- a/disk-utils/Makemodule.am
+++ b/disk-utils/Makemodule.am
@@ -107,18 +107,18 @@ test_fsck_cramfs_LDADD = $(fsck_cramfs_LDADD)
 test_fsck_cramfs_CFLAGS = $(AM_CFLAGS) -DINCLUDE_FS_TESTS
 endif
 
+if BUILD_FDFORMAT
+usrsbin_exec_PROGRAMS += fdformat
+dist_man_MANS += disk-utils/fdformat.8
+fdformat_SOURCES = disk-utils/fdformat.c
+endif
 
 if LINUX
 sbin_PROGRAMS += blockdev
 dist_man_MANS += disk-utils/blockdev.8
 blockdev_SOURCES = disk-utils/blockdev.c
 blockdev_LDADD = $(LDADD) libcommon.la
-
-usrsbin_exec_PROGRAMS += fdformat
-dist_man_MANS += disk-utils/fdformat.8
-fdformat_SOURCES = disk-utils/fdformat.c
-endif # LINUX
-
+endif
 
 if BUILD_PARTX
 usrsbin_exec_PROGRAMS += partx addpart delpart resizepart