diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-02-09 17:42:57 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-02-09 17:42:57 +0100 |
| commit | 4e509b6369febbfca15b83c47394d30f7ce5e4a7 (patch) | |
| tree | 61b9e4c137bc6eb56cd61ecbd476dd3be00c8f0c | |
| parent | 5ec3aea854387a5bfc02938546f5e8bd057e0113 (diff) | |
updated for version 7.3.117v7.3.117
Problem: On some systems --as-needed does not work, because the "tinfo"
library is included indirectly from "ncurses". (Charles Campbell)
Solution: In configure prefer using "tinfo" instead of "ncurses".
| -rwxr-xr-x | src/auto/configure | 6 | ||||
| -rw-r--r-- | src/configure.in | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/auto/configure b/src/auto/configure index fae21ff904..4a4551511f 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -9886,9 +9886,9 @@ rm -f core conftest.err conftest.$ac_objext \ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: empty: automatic terminal library selection" >&5 $as_echo "empty: automatic terminal library selection" >&6; } - case "`uname -s 2>/dev/null`" in - OSF1|SCO_SV) tlibs="ncurses curses termlib termcap";; - *) tlibs="ncurses termlib termcap curses";; + case "`uname -s 2>/dev/null`" in + OSF1|SCO_SV) tlibs="tinfo ncurses curses termlib termcap";; + *) tlibs="tinfo ncurses termlib termcap curses";; esac for libname in $tlibs; do as_ac_Lib=`$as_echo "ac_cv_lib_${libname}''_tgetent" | $as_tr_sh` diff --git a/src/configure.in b/src/configure.in index 7b5e08f080..815d0e8c7b 100644 --- a/src/configure.in +++ b/src/configure.in @@ -2618,13 +2618,14 @@ else AC_MSG_RESULT([empty: automatic terminal library selection]) dnl On HP-UX 10.10 termcap or termlib should be used instead of dnl curses, because curses is much slower. - dnl Newer versions of ncurses are preferred over anything. + dnl Newer versions of ncurses are preferred over anything, except + dnl when tinfo has been split off, it conains all we need. dnl Older versions of ncurses have bugs, get a new one! dnl Digital Unix (OSF1) should use curses (Ronald Schild). dnl On SCO Openserver should prefer termlib (Roger Cornelius). case "`uname -s 2>/dev/null`" in - OSF1|SCO_SV) tlibs="ncurses curses termlib termcap";; - *) tlibs="ncurses termlib termcap curses";; + OSF1|SCO_SV) tlibs="tinfo ncurses curses termlib termcap";; + *) tlibs="tinfo ncurses termlib termcap curses";; esac for libname in $tlibs; do AC_CHECK_LIB(${libname}, tgetent,,) diff --git a/src/version.c b/src/version.c index be30affd3a..10d79adac9 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 117, +/**/ 116, /**/ 115, |