diff options
| author | Karel Zak | 2017-05-30 17:10:40 +0200 |
|---|---|---|
| committer | Karel Zak | 2017-05-30 17:14:12 +0200 |
| commit | 23d47267848129b520dd187c0db02f8b5b684372 (patch) | |
| tree | ffba162c22149d34f1e9e63c1a9c87db8fb60dad /lib/Makemodule.am | |
| parent | build-sys: make ncurses detection more robust (diff) | |
| download | kernel-qcow2-util-linux-23d47267848129b520dd187c0db02f8b5b684372.tar.gz kernel-qcow2-util-linux-23d47267848129b520dd187c0db02f8b5b684372.tar.xz kernel-qcow2-util-linux-23d47267848129b520dd187c0db02f8b5b684372.zip | |
lib/colors: ncurses cleanup
* use proper paths to term.h
* keep ncurses support optional
* link with TINFO_LIBS (-ltinfo), or fallback to NCURSES_LIBS (-ltinfo -lncurses)
* don't include unnecessary ncurses.h (term.h is enough)
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'lib/Makemodule.am')
| -rw-r--r-- | lib/Makemodule.am | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/Makemodule.am b/lib/Makemodule.am index 358b85aee..7a018f516 100644 --- a/lib/Makemodule.am +++ b/lib/Makemodule.am @@ -50,9 +50,19 @@ libcommon_la_SOURCES += lib/sysfs.c endif noinst_LTLIBRARIES += libtcolors.la -libtcolors_la_CFLAGS = $(AM_CFLAGS) $(TINFO_CFLAGS) -libtcolors_la_LIBADD = $(TINFO_LIBS) +libtcolors_la_CFLAGS = $(AM_CFLAGS) libtcolors_la_SOURCES = lib/colors.c lib/color-names.c include/colors.h include/color-names.h +libtcolors_la_LIBADD = +# tinfo or ncurses are optional +if HAVE_TINFO +libtcolors_la_LIBADD += $(TINFO_LIBS) +libtcolors_la_CFLAGS += $(TINFO_CFLAGS) +else +if HAVE_NCURSES +libtcolors_la_LIBADD += $(NCURSES_LIBS) +libtcolors_la_CFLAGS += $(NCURSES_CFLAGS) +endif +endif # !HAVE_TINFO dist_man_MANS += lib/terminal-colors.d.5 |