diff options
| author | Bryan Hundven <bryanhundven@gmail.com> | 2015-11-15 18:20:25 -0800 |
|---|---|---|
| committer | Bryan Hundven <bryanhundven@gmail.com> | 2015-11-15 18:20:25 -0800 |
| commit | 6ac8e31a519f41af7838bb5261e0fe989fb428bd (patch) | |
| tree | fc2153841162e1b9d052421538526c7d526adbf7 | |
| parent | 4b5f10df03e21ea346625f5009b893c8ad5d5f90 (diff) | |
| parent | 6c49a232a81cf4f4f22a13b13e91af74e7edab32 (diff) | |
| download | crosstool-ng-6ac8e31a519f41af7838bb5261e0fe989fb428bd.tar.gz crosstool-ng-6ac8e31a519f41af7838bb5261e0fe989fb428bd.tar.bz2 crosstool-ng-6ac8e31a519f41af7838bb5261e0fe989fb428bd.zip | |
Merge pull request #262 from bhundven/fix_ncurses_tinfo
configure: Correctly search for tinfo for kconfig
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | kconfig/Makefile | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index f5c5e109..4f0b4283 100644 --- a/configure.ac +++ b/configure.ac @@ -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 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)) |