Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 682386 | Differences between
and this patch

Collapse All | Expand All

(-)a/config/readline_check_version.m4 (-4 / +20 lines)
Lines 7-16 AC_MSG_CHECKING(which library has the termcap functions) Link Here
7
_bash_needmsg=
7
_bash_needmsg=
8
fi
8
fi
9
AC_CACHE_VAL(bash_cv_termcap_lib,
9
AC_CACHE_VAL(bash_cv_termcap_lib,
10
[AC_CHECK_LIB(]$curses_lib_name[, tgetent, bash_cv_termcap_lib=lib]$curses_lib_name[,
10
[AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc,
11
  [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
11
if test "$curses_lib_name" = "ncursesw"; then
12
    [AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc,
12
	[AC_CHECK_LIB(ncursesw, tgetent, bash_cv_termcap_lib=libncursesw,
13
      bash_cv_termcap_lib=gnutermcap)])])])
13
		[AC_CHECK_LIB(tinfow, tgetent, bash_cv_termcap_lib=libtinfow)]
14
	)]
15
elif test "$curses_lib_name" = "ncurses"; then
16
	[AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses,
17
		[AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo)]
18
	)]
19
elif test "$curses_lib_name" = "curses"; then
20
	[AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses)]
21
else
22
	[AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
23
		bash_cv_termcap_lib=gnutermcap
24
	)]
25
fi
26
)])
14
if test "X$_bash_needmsg" = "Xyes"; then
27
if test "X$_bash_needmsg" = "Xyes"; then
15
AC_MSG_CHECKING(which library has the termcap functions)
28
AC_MSG_CHECKING(which library has the termcap functions)
16
fi
29
fi
Lines 19-24 if test $bash_cv_termcap_lib = gnutermcap && test -z "$prefer_curses"; then Link Here
19
LDFLAGS="$LDFLAGS -L./lib/termcap"
32
LDFLAGS="$LDFLAGS -L./lib/termcap"
20
TERMCAP_LIB="./lib/termcap/libtermcap.a"
33
TERMCAP_LIB="./lib/termcap/libtermcap.a"
21
TERMCAP_DEP="./lib/termcap/libtermcap.a"
34
TERMCAP_DEP="./lib/termcap/libtermcap.a"
35
elif test $bash_cv_termcap_lib = libtinfow; then
36
TERMCAP_LIB=-ltinfow
37
TERMCAP_DEP=
22
elif test $bash_cv_termcap_lib = libtinfo; then
38
elif test $bash_cv_termcap_lib = libtinfo; then
23
TERMCAP_LIB=-ltinfo
39
TERMCAP_LIB=-ltinfo
24
TERMCAP_DEP=
40
TERMCAP_DEP=

Return to bug 682386