diff options
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | sys-utils/Makemodule.am | 14 |
2 files changed, 14 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 6bf50480a..e742801d2 100644 --- 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 bfd5eccac..30b5d3e02 100644 --- 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 |