diff options
author | Karel Zak | 2013-01-24 19:23:56 +0100 |
---|---|---|
committer | Karel Zak | 2013-01-24 19:23:56 +0100 |
commit | 53b22add73edc34636068fd7fecfe7da7ff9eb78 (patch) | |
tree | a527e5e6d3bfdcef1cf483fd0f44e4edb2abab4a | |
parent | build-sys: support list of variables for UL_REQUIRES_HAVE macro (diff) | |
download | kernel-qcow2-util-linux-53b22add73edc34636068fd7fecfe7da7ff9eb78.tar.gz kernel-qcow2-util-linux-53b22add73edc34636068fd7fecfe7da7ff9eb78.tar.xz kernel-qcow2-util-linux-53b22add73edc34636068fd7fecfe7da7ff9eb78.zip |
build-sys: add --disable-{more,ul,pg}
Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r-- | configure.ac | 29 | ||||
-rw-r--r-- | text-utils/Makemodule.am | 54 |
2 files changed, 60 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac index 52deda848..9024809e7 100644 --- a/configure.ac +++ b/configure.ac @@ -1057,7 +1057,7 @@ AM_CONDITIONAL(BUILD_MESG, test "x$build_mesg" = xyes) AC_ARG_ENABLE([raw], - AS_HELP_STRING([--enable-raw], [build raw]), + AS_HELP_STRING([--disable-raw], [do not build raw]), [], enable_raw=check ) UL_BUILD_INIT([raw]) @@ -1169,6 +1169,33 @@ UL_REQUIRES_HAVE([runuser], [security_pam_misc_h], [PAM header file]) AM_CONDITIONAL(BUILD_RUNUSER, test "x$build_runuser" = xyes) +AC_ARG_ENABLE([ul], + AS_HELP_STRING([--disable-ul], [do not build ul]), + [], enable_ul=check +) +UL_BUILD_INIT([ul]) +UL_REQUIRES_HAVE([ul], [ncurses, tinfo], [ncurses or tinfo libraries]) +AM_CONDITIONAL(BUILD_UL, test "x$build_ul" = xyes) + + +AC_ARG_ENABLE([more], + AS_HELP_STRING([--disable-more], [do not build more]), + [], enable_more=check +) +UL_BUILD_INIT([more]) +UL_REQUIRES_HAVE([more], [ncurses, tinfo, termcap], [ncurses, tinfo or termcap libraries]) +AM_CONDITIONAL(BUILD_MORE, test "x$build_more" = xyes) + + +AC_ARG_ENABLE([pg], + AS_HELP_STRING([--disable-pg], [do not build pg]), + [], enable_pg=check +) +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([schedutils], AS_HELP_STRING([--disable-schedutils], [do not build chrt, ionice, teskset]), [], enable_schedutils=yes 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 + |