diff options
| -rw-r--r-- | lib/Makemodule.am | 14 | ||||
| -rw-r--r-- | lib/colors.c | 22 |
2 files changed, 27 insertions, 9 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 diff --git a/lib/colors.c b/lib/colors.c index b2742e4e9..72c5158cb 100644 --- a/lib/colors.c +++ b/lib/colors.c @@ -10,9 +10,15 @@ #include <sys/types.h> #include <dirent.h> #include <ctype.h> -#ifdef HAVE_LIBTINFO -# include <curses.h> -# include <term.h> + +#if defined(HAVE_LIBNCURSES) || defined(HAVE_LIBNCURSESW) +# ifdef HAVE_TERM_H +# include <term.h> +# elif defined(HAVE_NCURSES_TERM_H) +# include <ncurses/term.h> +# elif defined(HAVE_NCURSESW_TERM_H) +# include <ncursesw/term.h> +# endif #endif #include "c.h" @@ -643,19 +649,21 @@ static int colors_terminal_is_ready(void) if (isatty(STDOUT_FILENO) != 1) goto none; -#ifdef HAVE_LIBTINFO +#if defined(HAVE_LIBNCURSES) || defined(HAVE_LIBNCURSESW) { int ret; - if (setupterm(NULL, STDOUT_FILENO, &ret) != OK || ret != 1) + if (setupterm(NULL, STDOUT_FILENO, &ret) != 0 || ret != 1) goto none; ncolors = tigetnum("colors"); if (ncolors <= 2) goto none; } #endif - DBG(CONF, ul_debug("terminal is ready (supports %d colors)", ncolors)); - return 1; + if (ncolors != -1) { + DBG(CONF, ul_debug("terminal is ready (supports %d colors)", ncolors)); + return 1; + } none: DBG(CONF, ul_debug("terminal is NOT ready")); return 0; |