ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-04-13 22:23:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #262 from bhundven/fix_ncurses_tinfo

Browse Source 
configure: Correctly search for tinfo for kconfig
This commit is contained in:
Bryan Hundven 2015-11-15 18:20:25 -08:00
commit 6ac8e31a51
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -339,15 +339,6 @@ LIBS=$SAVE_LIBS
AC_SUBST([INTL_LIBS])
#----------------------------------------
# Check for tinfo, for the kconfig frontends
AC_SEARCH_LIBS(
[tigetnum],
[tinfo],
[ac_ct_tinfo_lib_found=yes; break])
AS_IF(
[test -z "$ac_ct_tinfo_lib_found"],
[AC_MSG_ERROR([could not find tinfo library, required for the kconfig frontends])])
# Check for ncurses, for the kconfig frontends
AC_SUBST([ac_ct_curses_hdr])
AC_CHECK_HEADERS(
@ -363,6 +354,9 @@ AC_SEARCH_LIBS(
AS_IF(
[test -z "$ac_ct_curses_lib_found"],
[AC_MSG_ERROR([could not find curses library, required for the kconfig frontends])])
AC_SEARCH_LIBS(
[tgetent],
[termcap tinfo ncursesw ncurses curses])
#--------------------------------------------------------------------
# Lastly, take care of crosstool-NG internal values

2
kconfig/Makefile
View File

@ -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))