From 4310faf9507b863adf0d735564f28db5c68ca600 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Fri, 27 Feb 2015 13:57:34 +0100 Subject: lib/colors: use libtinfo to check terminal capability The current implementation assumes that all terminals supports colors and users are forcet to use terminal-colors.d/ to disable colors for some terminals. This patch checks for maximal supported colors for the current terminal and colors are automatically disabled for terminals like vt100. The patch moves lib/colors.c from libcommon.la to libtcolors.la to avoid collisions with another utils. Signed-off-by: Karel Zak --- disk-utils/Makemodule.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'disk-utils/Makemodule.am') diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am index b4606a148..766b40bcc 100644 --- a/disk-utils/Makemodule.am +++ b/disk-utils/Makemodule.am @@ -134,7 +134,7 @@ fdisk_SOURCES = \ disk-utils/fdisk-list.c \ disk-utils/fdisk-list.h -fdisk_LDADD = $(LDADD) libcommon.la libfdisk.la libsmartcols.la +fdisk_LDADD = $(LDADD) libcommon.la libfdisk.la libsmartcols.la libtcolors.la fdisk_CFLAGS = $(AM_CFLAGS) -I$(ul_libfdisk_incdir) -I$(ul_libsmartcols_incdir) if BUILD_LIBBLKID @@ -166,7 +166,7 @@ sfdisk_SOURCES = \ disk-utils/fdisk-list.c \ disk-utils/fdisk-list.h -sfdisk_LDADD = $(LDADD) libcommon.la libfdisk.la libsmartcols.la +sfdisk_LDADD = $(LDADD) libcommon.la libfdisk.la libsmartcols.la libtcolors.la sfdisk_CFLAGS = $(AM_CFLAGS) -I$(ul_libfdisk_incdir) -I$(ul_libsmartcols_incdir) if BUILD_LIBUUID @@ -193,7 +193,7 @@ if BUILD_CFDISK sbin_PROGRAMS += cfdisk dist_man_MANS += disk-utils/cfdisk.8 cfdisk_SOURCES = disk-utils/cfdisk.c -cfdisk_LDADD = $(LDADD) libcommon.la libfdisk.la +cfdisk_LDADD = $(LDADD) libcommon.la libfdisk.la libtcolors.la cfdisk_CFLAGS = $(AM_CFLAGS) -I$(ul_libfdisk_incdir) if BUILD_LIBUUID -- cgit v1.2.3-55-g7522