diff options
| author | Karel Zak | 2014-05-21 12:13:12 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-05-21 12:13:12 +0200 |
| commit | 3d9fdac5eaafaf2358877d5d922f67ed36cb522a (patch) | |
| tree | 7690b727fd601bc10028a70f1e17157bc214982b | |
| parent | lsblk: add --sort <column> (diff) | |
| download | kernel-qcow2-util-linux-3d9fdac5eaafaf2358877d5d922f67ed36cb522a.tar.gz kernel-qcow2-util-linux-3d9fdac5eaafaf2358877d5d922f67ed36cb522a.tar.xz kernel-qcow2-util-linux-3d9fdac5eaafaf2358877d5d922f67ed36cb522a.zip | |
build-sys: add --disable-minix
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | disk-utils/Makemodule.am | 2 | ||||
| -rw-r--r-- | m4/ul.m4 | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index b83df0d06..b0a16d9f8 100644 --- a/configure.ac +++ b/configure.ac @@ -1001,6 +1001,14 @@ UL_BUILD_INIT([bfs]) AM_CONDITIONAL([BUILD_BFS], [test "x$build_bfs" = xyes]) +AC_ARG_ENABLE([minix], + AS_HELP_STRING([--disable-minix], [do not build fsck.minix, mkfs.minix]), + [], [enable_minix=yes] +) +UL_BUILD_INIT([minix]) +AM_CONDITIONAL([BUILD_MINIX], [test "x$build_minix" = xyes]) + + AC_ARG_ENABLE([fdformat], AS_HELP_STRING([--disable-fdformat], [do not build fdformat]), [], [enable_fdformat=check] @@ -1021,6 +1029,7 @@ 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]) diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am index 2ef3edc4f..170061a45 100644 --- a/disk-utils/Makemodule.am +++ b/disk-utils/Makemodule.am @@ -1,4 +1,5 @@ +if BUILD_MINIX sbin_PROGRAMS += fsck.minix dist_man_MANS += disk-utils/fsck.minix.8 fsck_minix_SOURCES = \ @@ -12,6 +13,7 @@ mkfs_minix_SOURCES = \ disk-utils/minix_programs.h \ disk-utils/mkfs.minix.c mkfs_minix_LDADD = $(LDADD) libcommon.la +endif sbin_PROGRAMS += mkfs dist_man_MANS += disk-utils/mkfs.8 @@ -296,7 +296,7 @@ AC_DEFUN([UL_REQUIRES_SYSCALL_CHECK], [ fi ]) -dnl UL_INIT_BUILD(NAME, [ENABLE_STATE], [VARSUFFIX = $1]) +dnl UL_BUILD_INIT(NAME, [ENABLE_STATE], [VARSUFFIX = $1]) dnl dnl Initializes $build_<name> variable according to $enable_<name>. If dnl $enable_<name> is undefined then ENABLE_STATE is used and $enable_<name> is |