[PATCH 07/33] build-sys: add --disable-setterm to ./configure

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
---
 configure.ac             | 6 ++++++
 term-utils/Makemodule.am | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index dd5d3e1..497850c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1290,6 +1290,12 @@ UL_BUILD_INIT([pg])
 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=yes
+)
+UL_BUILD_INIT([setterm])
+AM_CONDITIONAL(BUILD_SETTERM, test "x$build_setterm" = xyes)
 
 AC_ARG_ENABLE([schedutils],
   AS_HELP_STRING([--disable-schedutils], [do not build chrt, ionice, teskset]),
diff --git a/term-utils/Makemodule.am b/term-utils/Makemodule.am
index f4fa92d..fdf4d98 100644
--- a/term-utils/Makemodule.am
+++ b/term-utils/Makemodule.am
@@ -24,7 +24,7 @@ agetty_LDADD = $(LDADD) libcommon.la
 endif # BUILD_AGETTY
 
 
-# TODO: add BUILD_SETTERM to configure.am
+if BUILD_SETTERM
 if HAVE_NCURSES
 if LINUX
 usrbin_exec_PROGRAMS += setterm
@@ -37,6 +37,7 @@ else
 setterm_LDADD = $(LDADD) @NCURSES_LIBS@
 endif
 endif
+endif
 
 
 if BUILD_RESET
-- 
1.8.2.1

--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux