From 6c49a232a81cf4f4f22a13b13e91af74e7edab32 Mon Sep 17 00:00:00 2001 From: Bryan Hundven Date: Sat, 14 Nov 2015 22:55:40 -0800 Subject: configure: Correctly search for tinfo for kconfig I previously thought that tinfo could only be a link to libncurses in modern ncurses installations. I was wrong. Now we check for ncurses, then check for tinfo. If tinfo is a link to ncurses, it is then not required to link against. But if libtinfo is providing tgetent, and not libncurses, then we must add it to LIBS as well. Also, kconfig shouldn't hardcode -lncurses, it should use what is in $(LIBS). Signed-off-by: Bryan Hundven --- kconfig/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kconfig') diff --git a/kconfig/Makefile b/kconfig/Makefile index 27482afe..9f30566a 100644 --- a/kconfig/Makefile +++ b/kconfig/Makefile @@ -48,7 +48,7 @@ nconf_SRC = nconf.c nconf.gui.c nconf_OBJ = $(patsubst %.c,%.o,$(nconf_SRC)) nconf_DEP = $(patsubst %.c,%.dep,$(nconf_SRC)) $(nconf_OBJ) $(nconf_DEP): CFLAGS += $(INTL_CFLAGS) -I/usr/include/ncurses -nconf: LDFLAGS += -lmenu -lpanel -lncurses +nconf: LDFLAGS += -lmenu -lpanel $(LIBS) # These are generated files: ALL_OBJS = $(sort $(COMMON_OBJ) $(LX_OBJ) $(conf_OBJ) $(mconf_OBJ) $(nconf_OBJ)) -- cgit v1.2.3