From 53b22add73edc34636068fd7fecfe7da7ff9eb78 Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Thu, 24 Jan 2013 19:23:56 +0100
Subject: build-sys: add --disable-{more,ul,pg}

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 text-utils/Makemodule.am | 54 ++++++++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 22 deletions(-)

(limited to 'text-utils/Makemodule.am')

diff --git a/text-utils/Makemodule.am b/text-utils/Makemodule.am
index f2c10ebc6..050343eb7 100644
--- a/text-utils/Makemodule.am
+++ b/text-utils/Makemodule.am
@@ -48,34 +48,44 @@ line_SOURCES = text-utils/line.c
 dist_man_MANS += text-utils/line.1
 endif
 
-# TODO: add BUILD_{MORE,UL,PG}  ./configure.am
-if HAVE_NCURSES
-bin_PROGRAMS += more
-more_SOURCES = text-utils/more.c
 
-usrbin_exec_PROGRAMS += ul pg
-ul_SOURCES = text-utils/ul.c
+if BUILD_PG
+usrbin_exec_PROGRAMS += pg
+dist_man_MANS += text-utils/pg.1
 pg_SOURCES = text-utils/pg.c
+pg_LDADD = $(LDADD) libcommon.la @NCURSES_LIBS@
+if HAVE_TINFO
+pg_LDADD += -ltinfo
+endif
+endif # BUILD_PG
+
 
+if BUILD_UL
+usrbin_exec_PROGRAMS += ul
+dist_man_MANS += text-utils/ul.1
+ul_SOURCES = text-utils/ul.c
+ul_LDADD = $(LDADD)
 if HAVE_TINFO
-more_LDADD = $(LDADD) -ltinfo
-pg_LDADD = $(LDADD) libcommon.la -ltinfo @NCURSES_LIBS@
-ul_LDADD = $(LDADD) -ltinfo
-else
-more_LDADD = $(LDADD) @NCURSES_LIBS@
-pg_LDADD = $(LDADD) libcommon.la @NCURSES_LIBS@
-ul_LDADD = $(LDADD) @NCURSES_LIBS@
+ul_LDADD += -ltinfo
+else 
+ul_LDADD += @NCURSES_LIBS@
 endif
+endif # BUILD_UL
 
-dist_man_MANS += \
-	text-utils/ul.1 \
-	text-utils/more.1 \
-	text-utils/pg.1
-else
-if HAVE_TERMCAP
+
+if BUILD_MORE
 bin_PROGRAMS += more
-more_SOURCES = text-utils/more.c
-more_LDADD = $(LDADD) -ltermcap
 dist_man_MANS += text-utils/more.1
+more_SOURCES = text-utils/more.c
+more_LDADD = $(LDADD)
+if HAVE_TINFO
+more_LDADD += -ltinfo
+else
+if HAVE_NCURSES
+more_LDADD += @NCURSES_LIBS@
+else
+more_LDADD += -ltermcap
 endif
-endif # !HAVE_NCURSES
+endif
+endif # BUILD_MORE
+
-- 
cgit v1.2.3-55-g7522