build-sys: fstrim depends on libmount

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

diff --git a/configure.ac b/configure.ac
index 6bf50480a808aa794ff38ab6b2abb1b428aba2d2..e742801d23c4e45c9aa4cad94c42ff7e274bf552 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1002,6 +1002,12 @@ UL_REQUIRES_HAVE([hwclock], [io, linuxdummy], [ioperm iopl function or Linux])
 AM_CONDITIONAL([BUILD_HWCLOCK], [test "x$build_hwclock" = xyes])
 
 
+UL_BUILD_INIT([fstrim], [check])
+UL_REQUIRES_LINUX([fstrim])
+UL_REQUIRES_BUILD([fstrim], [libmount])
+AM_CONDITIONAL([BUILD_FSTRIM], [test "x$build_fstrim" = xyes])
+
+
 UL_BUILD_INIT([swapon], [check])
 UL_REQUIRES_LINUX([swapon])
 UL_REQUIRES_BUILD([swapon], [libblkid])

diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index bfd5eccacae051dae004815eaa994046020ba812..30b5d3e0246988a12109f24ec5ca0609ddda26b6 100644 (file)
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -47,6 +47,14 @@ cytune_SOURCES = sys-utils/cytune.c sys-utils/cyclades.h
 cytune_LDADD = $(LDADD) libcommon.la
 endif
 
+if BUILD_FSTRIM
+sbin_PROGRAMS += fstrim
+dist_man_MANS += sys-utils/fstrim.8
+fstrim_SOURCES = sys-utils/fstrim.c
+fstrim_LDADD = $(LDADD) libcommon.la libmount.la
+fstrim_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
+endif
+
 if LINUX
 #
 # Linux-only utils with no another dependencies. All another dependencies have
@@ -65,12 +73,6 @@ sbin_PROGRAMS += fsfreeze
 dist_man_MANS += sys-utils/fsfreeze.8
 fsfreeze_SOURCES = sys-utils/fsfreeze.c
 
-sbin_PROGRAMS += fstrim
-dist_man_MANS += sys-utils/fstrim.8
-fstrim_SOURCES = sys-utils/fstrim.c
-fstrim_LDADD = $(LDADD) libcommon.la libmount.la
-fstrim_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
-
 sbin_PROGRAMS += blkdiscard
 dist_man_MANS += sys-utils/blkdiscard.8
 blkdiscard_SOURCES = sys-utils/blkdiscard.c