From d78d040933a013fc3264b014a8629734aac67650 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Fri, 26 Apr 2013 13:47:54 +0200 Subject: build-sys: add --disable-setterm Signed-off-by: Karel Zak --- configure.ac | 10 ++++++++++ term-utils/Makemodule.am | 5 +---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 94c4fe126..c1dff15f1 100644 --- a/configure.ac +++ b/configure.ac @@ -1294,6 +1294,16 @@ UL_REQUIRES_HAVE([pg], [ncurses], [ncurses or ncursesw library]) AM_CONDITIONAL(BUILD_PG, test "x$build_pg" = xyes) +AC_ARG_ENABLE([setterm], + AS_HELP_STRING([--disable-setterm], [do not build setterm]), + [], enable_setterm=check +) +UL_BUILD_INIT([setterm]) +UL_REQUIRES_LINUX([setterm]) +UL_REQUIRES_HAVE([setterm], [ncurses], [ncurses library]) +AM_CONDITIONAL(BUILD_SETTERM, test "x$build_setterm" = xyes) + + AC_ARG_ENABLE([schedutils], AS_HELP_STRING([--disable-schedutils], [do not build chrt, ionice, teskset]), [], enable_schedutils=yes diff --git a/term-utils/Makemodule.am b/term-utils/Makemodule.am index f4fa92d4a..470987344 100644 --- a/term-utils/Makemodule.am +++ b/term-utils/Makemodule.am @@ -24,13 +24,10 @@ agetty_LDADD = $(LDADD) libcommon.la endif # BUILD_AGETTY -# TODO: add BUILD_SETTERM to configure.am -if HAVE_NCURSES -if LINUX +if BUILD_SETTERM usrbin_exec_PROGRAMS += setterm dist_man_MANS += term-utils/setterm.1 setterm_SOURCES = term-utils/setterm.c -endif if HAVE_TINFO setterm_LDADD = $(LDADD) -ltinfo else -- cgit v1.2.3-55-g7522