diff options
| -rw-r--r-- | bash-completion/Makemodule.am | 4 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | schedutils/Makemodule.am | 6 |
3 files changed, 10 insertions, 8 deletions
diff --git a/bash-completion/Makemodule.am b/bash-completion/Makemodule.am index 0031aba0a..1622894ec 100644 --- a/bash-completion/Makemodule.am +++ b/bash-completion/Makemodule.am @@ -141,9 +141,10 @@ endif # ...misc-utils # schedutils... -if BUILD_SCHEDUTILS +if BUILD_CHRT dist_bashcompletion_DATA += \ bash-completion/chrt +endif if BUILD_IONICE dist_bashcompletion_DATA += \ bash-completion/ionice @@ -152,7 +153,6 @@ if BUILD_TASKSET dist_bashcompletion_DATA += \ bash-completion/taskset endif -endif # BUILD_SCHEDUTILS # ...schedutils # sys-utils... diff --git a/configure.ac b/configure.ac index d5b33a601..aa7bf1ca7 100644 --- a/configure.ac +++ b/configure.ac @@ -1426,13 +1426,13 @@ UL_REQUIRES_LINUX([setterm]) UL_REQUIRES_HAVE([setterm], [ncurses], [ncurses library]) AM_CONDITIONAL([BUILD_SETTERM], [test "x$build_setterm" = xyes]) - +# build_schedutils= is just configure-only variable to control +# ionice, taskset and chrt AC_ARG_ENABLE([schedutils], AS_HELP_STRING([--disable-schedutils], [do not build chrt, ionice, taskset]), [], [enable_schedutils=yes] ) UL_BUILD_INIT([schedutils]) -AM_CONDITIONAL([BUILD_SCHEDUTILS], [test "x$build_schedutils" = xyes]) UL_BUILD_INIT([ionice], [check]) UL_REQUIRES_BUILD([ionice], [schedutils]) @@ -1470,6 +1470,10 @@ UL_REQUIRES_SYSCALL_CHECK([taskset], [sched_getaffinity]) AM_CONDITIONAL([BUILD_TASKSET], [test "x$build_taskset" = xyes]) +UL_BUILD_INIT([chrt], [check]) +UL_REQUIRES_BUILD([chrt], [schedutils]) +AM_CONDITIONAL([BUILD_CHRT], [test "x$build_chrt" = xyes]) + AC_ARG_ENABLE([wall], AS_HELP_STRING([--disable-wall], [do not build wall]), diff --git a/schedutils/Makemodule.am b/schedutils/Makemodule.am index d447536da..f32d2b307 100644 --- a/schedutils/Makemodule.am +++ b/schedutils/Makemodule.am @@ -1,9 +1,9 @@ -if BUILD_SCHEDUTILS - +if BUILD_CHRT usrbin_exec_PROGRAMS += chrt dist_man_MANS += schedutils/chrt.1 chrt_SOURCES = schedutils/chrt.c chrt_LDADD = $(LDADD) libcommon.la +endif if BUILD_IONICE usrbin_exec_PROGRAMS += ionice @@ -18,5 +18,3 @@ dist_man_MANS += schedutils/taskset.1 taskset_SOURCES = schedutils/taskset.c taskset_LDADD = $(LDADD) libcommon.la endif - -endif # BUILD_SCHEDUTILS |