diff options
author | Karel Zak | 2013-04-10 22:27:31 +0200 |
---|---|---|
committer | Karel Zak | 2013-04-10 22:27:31 +0200 |
commit | 78cdc2541571aa4beb49345c58f78c6643913244 (patch) | |
tree | f7bf8d3d2f0238b830ae43c59084b6fd8d7f40cf | |
parent | docs: update AUTHORS file (diff) | |
download | kernel-qcow2-util-linux-78cdc2541571aa4beb49345c58f78c6643913244.tar.gz kernel-qcow2-util-linux-78cdc2541571aa4beb49345c58f78c6643913244.tar.xz kernel-qcow2-util-linux-78cdc2541571aa4beb49345c58f78c6643913244.zip |
build-sys: add --disable-cytune
Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r-- | bash-completion/Makemodule.am | 5 | ||||
-rw-r--r-- | configure.ac | 9 | ||||
-rw-r--r-- | sys-utils/Makemodule.am | 11 |
3 files changed, 19 insertions, 6 deletions
diff --git a/bash-completion/Makemodule.am b/bash-completion/Makemodule.am index 1a15bfa10..fc7d9f274 100644 --- a/bash-completion/Makemodule.am +++ b/bash-completion/Makemodule.am @@ -207,11 +207,14 @@ if BUILD_WDCTL dist_bashcompletion_DATA += \ bash-completion/wdctl endif +if BUILD_CYTUNE +dist_bashcompletion_DATA += \ + bash-completion/cytune +endif if LINUX dist_bashcompletion_DATA += \ bash-completion/blkdiscard \ bash-completion/ctrlaltdel \ - bash-completion/cytune \ bash-completion/dmesg \ bash-completion/fsfreeze \ bash-completion/fstrim \ diff --git a/configure.ac b/configure.ac index b45673304..7d1f56738 100644 --- a/configure.ac +++ b/configure.ac @@ -800,6 +800,15 @@ UL_REQUIRES_LINUX([losetup]) AM_CONDITIONAL(BUILD_LOSETUP, test "x$build_losetup" = xyes) +AC_ARG_ENABLE([cytune], + AS_HELP_STRING([--disable-cytune], [do not build cytune]), + [], enable_cytune=check +) +UL_BUILD_INIT([cytune]) +UL_REQUIRES_LINUX([cytune]) +AM_CONDITIONAL(BUILD_CYTUNE, test "x$build_cytune" = xyes) + + AC_ARG_ENABLE([fsck], AS_HELP_STRING([--disable-fsck], [do not build fsck]), [], enable_fsck=check diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am index c8194f36a..4139fcf65 100644 --- a/sys-utils/Makemodule.am +++ b/sys-utils/Makemodule.am @@ -40,6 +40,12 @@ dist_man_MANS += sys-utils/tunelp.8 tunelp_SOURCES = sys-utils/tunelp.c sys-utils/lp.h endif +if BUILD_CYTUNE +usrbin_exec_PROGRAMS += cytune +dist_man_MANS += sys-utils/cytune.8 +cytune_SOURCES = sys-utils/cytune.c sys-utils/cyclades.h +cytune_LDADD = $(LDADD) libcommon.la +endif if LINUX # @@ -69,11 +75,6 @@ dist_man_MANS += sys-utils/blkdiscard.8 blkdiscard_SOURCES = sys-utils/blkdiscard.c blkdiscard_LDADD = $(LDADD) libcommon.la -usrbin_exec_PROGRAMS += cytune -dist_man_MANS += sys-utils/cytune.8 -cytune_SOURCES = sys-utils/cytune.c sys-utils/cyclades.h -cytune_LDADD = $(LDADD) libcommon.la - usrsbin_exec_PROGRAMS += ldattach dist_man_MANS += sys-utils/ldattach.8 ldattach_SOURCES = sys-utils/ldattach.c |