build-sys: add BUILD_CHRT

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

diff --git a/bash-completion/Makemodule.am b/bash-completion/Makemodule.am
index 0031aba0a637b9e564f9d86e4dcf02afa9acd2e1..1622894ecd849d032bbe0352b00ef6b058af763f 100644 (file)
--- 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 d5b33a601609b389b36c20702fa8e99a47cd8dec..aa7bf1ca73fc2ca86789dbb97b6f61295b7aeddb 100644 (file)
--- 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 d447536dad9ef2f858fc033b89497a3c0613635e..f32d2b3074fdb5075813b4bce02f7c223f177913 100644 (file)
--- 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