oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

AC_FIND_FUNC_NO_LIBS should check libtinfo for tgetent

Browse Source
This commit is contained in:
Damir Franusic
2018-12-09 19:50:47 +01:00
committed by Luke Howard
parent 511c84fe65
commit 872222db35
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -456,7 +456,7 @@ AC_FIND_FUNC_NO_LIBS(openpty, util,[
#endif #endif
],[0,0,0,0,0]) ],[0,0,0,0,0])
AC_FIND_FUNC_NO_LIBS(tgetent, termcap ncurses curses,[ AC_FIND_FUNC_NO_LIBS(tgetent, termcap ncurses curses tinfo,[
#ifdef HAVE_TERMCAP_H #ifdef HAVE_TERMCAP_H
#include <termcap.h> #include <termcap.h>
#endif #endif

3
lib/libedit/config.h.in
View File

@@ -42,6 +42,9 @@
/* Define to 1 if you have the `ncurses' library (-lncurses). */ /* Define to 1 if you have the `ncurses' library (-lncurses). */
#undef HAVE_LIBNCURSES #undef HAVE_LIBNCURSES
/* Define to 1 if you have the `tinfo' library (-ltinfo). */
#undef HAVE_LIBTINFO
/* Define to 1 if you have the <limits.h> header file. */ /* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H #undef HAVE_LIMITS_H

3
lib/libedit/configure.ac
View File

@@ -36,7 +36,8 @@ EL_MANTYPE
AC_CHECK_LIB(curses, tgetent,, AC_CHECK_LIB(curses, tgetent,,
[AC_CHECK_LIB(ncurses, tgetent,, [AC_CHECK_LIB(ncurses, tgetent,,
[AC_MSG_ERROR([libcurses or libncurses are required!])] )] ) [AC_CHECK_LIB(tinfo, tgetent,,
[AC_MSG_ERROR([libcurses or libncurses are required!])] )] )] )
# Checks for header files. # Checks for header files.