build-sys: add BUILD_{SFDISK,BLOCKDEV,MKSWAP,IOSIZE,MKFS}

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

diff --git a/configure.ac b/configure.ac
index b0a16d9f80ac1f7d0717d7db51435fb1350e2494..79de3c7a3d94e2842ef0f44d1af5e99427cc8b75 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -829,6 +829,10 @@ UL_REQUIRES_BUILD([fdisk], [libfdisk])
 AM_CONDITIONAL([BUILD_FDISK], [test "x$build_fdisk" = xyes])
 
 
+UL_BUILD_INIT([sfdisk], [yes])
+AM_CONDITIONAL([BUILD_SFDISK], [test "x$build_sfdisk" = xyes])
+
+
 AC_ARG_ENABLE([mount],
   AS_HELP_STRING([--disable-mount], [do not build mount(8) and umount(8)]),
   [], [enable_mount=check]
@@ -1029,6 +1033,12 @@ UL_REQUIRES_HAVE([hwclock], [io, linuxdummy], [ioperm iopl function or Linux])
 AM_CONDITIONAL([BUILD_HWCLOCK], [test "x$build_hwclock" = xyes])
 
 
+UL_BUILD_INIT([mkfs], [yes])
+AM_CONDITIONAL([BUILD_MKFS], [test "x$build_mkfs" = xyes])
+
+UL_BUILD_INIT([isosize], [yes])
+AM_CONDITIONAL([BUILD_ISOSIZE], [test "x$build_isosize" = xyes])
+
 
 UL_BUILD_INIT([fstrim], [check])
 UL_REQUIRES_LINUX([fstrim])
@@ -1082,6 +1092,15 @@ UL_REQUIRES_BUILD([swaplabel], [libblkid])
 AM_CONDITIONAL([BUILD_SWAPLABEL], [test "x$build_swaplabel" = xyes])
 
 
+UL_BUILD_INIT([mkswap], [yes])
+AM_CONDITIONAL([BUILD_MKSWAP], [test "x$build_mkswap" = xyes])
+
+
+UL_BUILD_INIT([blockdev], [check])
+UL_REQUIRES_LINUX([blockdev])
+AM_CONDITIONAL([BUILD_BLOCKDEV], [test "x$build_blockdev" = xyes])
+
+
 UL_BUILD_INIT([prlimit], [check])
 UL_REQUIRES_LINUX([prlimit])
 UL_REQUIRES_SYSCALL_CHECK([prlimit], [UL_CHECK_SYSCALL([prlimit64])], [prlimit64])

diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am
index 170061a454eb40a75320a746288a038126d5ca89..302aa68496a36b67ab44c08df21f3c328e4391b7 100644 (file)
--- a/disk-utils/Makemodule.am
+++ b/disk-utils/Makemodule.am
@@ -15,14 +15,21 @@ mkfs_minix_SOURCES = \
 mkfs_minix_LDADD = $(LDADD) libcommon.la
 endif
 
+
+if BUILD_MKFS
 sbin_PROGRAMS += mkfs
 dist_man_MANS += disk-utils/mkfs.8
 mkfs_SOURCES = disk-utils/mkfs.c
+endif
+
 
+if BUILD_ISOSIZE
 usrbin_exec_PROGRAMS += isosize
 dist_man_MANS += disk-utils/isosize.8
 isosize_SOURCES = disk-utils/isosize.c
 isosize_LDADD = $(LDADD) libcommon.la
+endif
+
 
 if BUILD_BFS
 sbin_PROGRAMS += mkfs.bfs
@@ -32,6 +39,8 @@ mkfs_bfs_SOURCES = \
 mkfs_bfs_LDADD = $(LDADD) libcommon.la
 endif
 
+
+if BUILD_MKSWAP
 sbin_PROGRAMS += mkswap
 dist_man_MANS += disk-utils/mkswap.8
 mkswap_SOURCES = \
@@ -50,6 +59,7 @@ endif
 if HAVE_SELINUX
 mkswap_LDADD += -lselinux
 endif
+endif # BUILD_MKSWAP
 
 
 if BUILD_SWAPLABEL
@@ -102,7 +112,7 @@ dist_man_MANS += disk-utils/fdformat.8
 fdformat_SOURCES = disk-utils/fdformat.c
 endif
 
-if LINUX
+if BUILD_BLOCKDEV
 sbin_PROGRAMS += blockdev
 dist_man_MANS += disk-utils/blockdev.8
 blockdev_SOURCES = disk-utils/blockdev.c
@@ -141,7 +151,7 @@ endif
 endif # BUILD_FDISK
 
 
-if !ARCH_SPARC
+if BUILD_SFDISK
 sbin_PROGRAMS += sfdisk
 dist_man_MANS += disk-utils/sfdisk.8
 sfdisk_SOURCES = disk-utils/sfdisk.c
@@ -153,7 +163,7 @@ sfdisk_static_SOURCES = $(sfdisk_SOURCES)
 sfdisk_static_LDFLAGS = -all-static
 sfdisk_static_LDADD = $(sfdisk_LDADD)
 endif
-endif # ARCH_SPARC
+endif # BUILD_SFDISK
 
 
 if BUILD_CFDISK