diff options
author | Karel Zak | 2013-10-04 13:28:37 +0200 |
---|---|---|
committer | Karel Zak | 2013-10-04 13:28:37 +0200 |
commit | ccf92e6db7c22cbde2d2c12cc7328d67e9bacdf3 (patch) | |
tree | 8b73970ce0050e0b3cacd84f9889771a2b44ce6d | |
parent | libfdisk: cleanup warning messages (diff) | |
download | kernel-qcow2-util-linux-ccf92e6db7c22cbde2d2c12cc7328d67e9bacdf3.tar.gz kernel-qcow2-util-linux-ccf92e6db7c22cbde2d2c12cc7328d67e9bacdf3.tar.xz kernel-qcow2-util-linux-ccf92e6db7c22cbde2d2c12cc7328d67e9bacdf3.zip |
build-sys: use tinfo *or* ncurses for more(1), ul(1) and setterm(1)
* it seems that we don't have to link the utils with ncurses, tinfo is enough.
This change saves one unnecessary dependence.
* libtinfo is also distributed with pkg-config files, so we can use
PKG_CHECK_MODULES() as a primary source for LIBS and CFLAGS.
* add TINFO_CFLAGS (although it's probably always empty)
Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r-- | configure.ac | 13 | ||||
-rw-r--r-- | term-utils/Makemodule.am | 11 | ||||
-rw-r--r-- | text-utils/Makemodule.am | 25 |
3 files changed, 38 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 93572fe8a..c898f6103 100644 --- a/configure.ac +++ b/configure.ac @@ -674,15 +674,20 @@ AS_IF([test "x$with_slang" = xyes], [ ]) AM_CONDITIONAL([HAVE_SLANG], [test "x$have_slang" = xyes]) - AM_CONDITIONAL([BUILD_CFDISK], [test "x$have_slang" = xyes -o "x$have_ncurses" = xyes]) -AC_CHECK_LIB([tinfo], [tgetent], [have_tinfo=yes]) -AS_IF([test "x$have_tinfo" = xyes], [ - TINFO_LIBS="-ltinfo" +dnl Try pkg-config for libtinfo +PKG_CHECK_MODULES(TINFO, [tinfo], [have_tinfo=yes], [ + dnl If that failed, fall back to classic searching. + AC_CHECK_LIB([tinfo], [tgetent], [ + have_tinfo=yes + TINFO_LIBS="-ltinfo" + TINFO_CFLAGS=""]) ]) AC_SUBST([TINFO_LIBS]) +AC_SUBST([TINFO_CFLAGS]) +AM_CONDITIONAL([HAVE_TINFO], [test "x$have_tinfo" = xxyes]) AC_ARG_WITH([utempter], diff --git a/term-utils/Makemodule.am b/term-utils/Makemodule.am index b1c28f2f5..e53471f23 100644 --- a/term-utils/Makemodule.am +++ b/term-utils/Makemodule.am @@ -28,8 +28,15 @@ if BUILD_SETTERM usrbin_exec_PROGRAMS += setterm dist_man_MANS += term-utils/setterm.1 setterm_SOURCES = term-utils/setterm.c -setterm_CFLAGS = $(AM_CFLAGS) $(NCURSES_CFLAGS) -setterm_LDADD = $(LDADD) $(NCURSES_LIBS) $(TINFO_LIBS) +setterm_CFLAGS = $(AM_CFLAGS) +setterm_LDADD = $(LDADD) +if HAVE_TINFO +setterm_LDADD += $(TINFO_LIBS) +setterm_CFLAGS += $(TINFO_CFLAGS) +else +setterm_LDADD += $(NCURSES_LIBS) +setterm_CFLAGS += $(NCURSES_CFLAGS) +endif endif diff --git a/text-utils/Makemodule.am b/text-utils/Makemodule.am index a2b6fe9b2..970b452e9 100644 --- a/text-utils/Makemodule.am +++ b/text-utils/Makemodule.am @@ -53,7 +53,7 @@ if BUILD_PG usrbin_exec_PROGRAMS += pg dist_man_MANS += text-utils/pg.1 pg_SOURCES = text-utils/pg.c -pg_CFLAGS = $(AM_CFLAGS) $(BSD_WARN_CFLAGS) $(NCURSES_CFLAGS) +pg_CFLAGS = $(AM_CFLAGS) $(BSD_WARN_CFLAGS) $(NCURSES_CFLAGS) $(TINFO_CFLAGS) pg_LDADD = $(LDADD) libcommon.la $(NCURSES_LIBS) $(TINFO_LIBS) endif # BUILD_PG @@ -62,8 +62,15 @@ if BUILD_UL usrbin_exec_PROGRAMS += ul dist_man_MANS += text-utils/ul.1 ul_SOURCES = text-utils/ul.c -ul_CFLAGS = $(AM_CFLAGS) $(NCURSES_CFLAGS) -ul_LDADD = $(LDADD) $(NCURSES_LIBS) $(TINFO_LIBS) +ul_CFLAGS = $(AM_CFLAGS) +ul_LDADD = $(LDADD) +if HAVE_TINFO +ul_LDADD += $(TINFO_LIBS) +ul_LDADD += $(TINFO_CFLAGS) +else +ul_CFLAGS += $(NCURSES_CFLAGS) +ul_LDADD += $(NCURSES_LIBS) +endif endif # BUILD_UL @@ -71,8 +78,16 @@ if BUILD_MORE bin_PROGRAMS += more dist_man_MANS += text-utils/more.1 more_SOURCES = text-utils/more.c -more_CFLAGS = $(AM_CFLAGS) $(BSD_WARN_CFLAGS) $(NCURSES_CFLAGS) -more_LDADD = $(LDADD) $(NCURSES_LIBS) $(TINFO_LIBS) +more_CFLAGS = $(AM_CFLAGS) $(BSD_WARN_CFLAGS) +more_LDADD = $(LDADD) +if HAVE_TINFO +more_LDADD += $(TINFO_LIBS) +more_LDADD += $(TINFO_CFLAGS) +else +more_CFLAGS += $(NCURSES_CFLAGS) +more_LDADD += $(NCURSES_LIBS) +endif + if HAVE_TERMCAP more_LDADD += -ltermcap endif |