85ff02c
To: vim_dev@googlegroups.com
85ff02c
Subject: Patch 7.3.117
85ff02c
Fcc: outbox
85ff02c
From: Bram Moolenaar <Bram@moolenaar.net>
85ff02c
Mime-Version: 1.0
85ff02c
Content-Type: text/plain; charset=UTF-8
85ff02c
Content-Transfer-Encoding: 8bit
85ff02c
------------
85ff02c
85ff02c
Patch 7.3.117
85ff02c
Problem:    On some systems --as-needed does not work, because the "tinfo"
85ff02c
	    library is included indirectly from "ncurses". (Charles Campbell)
85ff02c
Solution:   In configure prefer using "tinfo" instead of "ncurses".
85ff02c
Files:	    src/configure.in, src/auto/configure
85ff02c
85ff02c
85ff02c
*** ../vim-7.3.116/src/configure.in	2010-11-16 19:25:56.000000000 +0100
85ff02c
--- src/configure.in	2011-02-09 17:28:16.000000000 +0100
85ff02c
***************
85ff02c
*** 2618,2630 ****
85ff02c
    AC_MSG_RESULT([empty: automatic terminal library selection])
85ff02c
    dnl  On HP-UX 10.10 termcap or termlib should be used instead of
85ff02c
    dnl  curses, because curses is much slower.
85ff02c
!   dnl  Newer versions of ncurses are preferred over anything.
85ff02c
    dnl  Older versions of ncurses have bugs, get a new one!
85ff02c
    dnl  Digital Unix (OSF1) should use curses (Ronald Schild).
85ff02c
    dnl  On SCO Openserver should prefer termlib (Roger Cornelius).
85ff02c
    case "`uname -s 2>/dev/null`" in
85ff02c
! 	OSF1|SCO_SV)	tlibs="ncurses curses termlib termcap";;
85ff02c
! 	*)	tlibs="ncurses termlib termcap curses";;
85ff02c
    esac
85ff02c
    for libname in $tlibs; do
85ff02c
      AC_CHECK_LIB(${libname}, tgetent,,)
85ff02c
--- 2618,2631 ----
85ff02c
    AC_MSG_RESULT([empty: automatic terminal library selection])
85ff02c
    dnl  On HP-UX 10.10 termcap or termlib should be used instead of
85ff02c
    dnl  curses, because curses is much slower.
85ff02c
!   dnl  Newer versions of ncurses are preferred over anything, except
85ff02c
!   dnl  when tinfo has been split off, it conains all we need.
85ff02c
    dnl  Older versions of ncurses have bugs, get a new one!
85ff02c
    dnl  Digital Unix (OSF1) should use curses (Ronald Schild).
85ff02c
    dnl  On SCO Openserver should prefer termlib (Roger Cornelius).
85ff02c
    case "`uname -s 2>/dev/null`" in
85ff02c
! 	OSF1|SCO_SV)	tlibs="tinfo ncurses curses termlib termcap";;
85ff02c
! 	*)	tlibs="tinfo ncurses termlib termcap curses";;
85ff02c
    esac
85ff02c
    for libname in $tlibs; do
85ff02c
      AC_CHECK_LIB(${libname}, tgetent,,)
85ff02c
*** ../vim-7.3.116/src/auto/configure	2010-11-16 19:25:56.000000000 +0100
85ff02c
--- src/auto/configure	2011-02-09 17:29:13.000000000 +0100
85ff02c
***************
85ff02c
*** 9886,9894 ****
85ff02c
  else
85ff02c
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: empty: automatic terminal library selection" >&5
85ff02c
  $as_echo "empty: automatic terminal library selection" >&6; }
85ff02c
!               case "`uname -s 2>/dev/null`" in
85ff02c
! 	OSF1|SCO_SV)	tlibs="ncurses curses termlib termcap";;
85ff02c
! 	*)	tlibs="ncurses termlib termcap curses";;
85ff02c
    esac
85ff02c
    for libname in $tlibs; do
85ff02c
      as_ac_Lib=`$as_echo "ac_cv_lib_${libname}''_tgetent" | $as_tr_sh`
85ff02c
--- 9886,9894 ----
85ff02c
  else
85ff02c
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: empty: automatic terminal library selection" >&5
85ff02c
  $as_echo "empty: automatic terminal library selection" >&6; }
85ff02c
!                 case "`uname -s 2>/dev/null`" in
85ff02c
! 	OSF1|SCO_SV)	tlibs="tinfo ncurses curses termlib termcap";;
85ff02c
! 	*)	tlibs="tinfo ncurses termlib termcap curses";;
85ff02c
    esac
85ff02c
    for libname in $tlibs; do
85ff02c
      as_ac_Lib=`$as_echo "ac_cv_lib_${libname}''_tgetent" | $as_tr_sh`
85ff02c
*** ../vim-7.3.116/src/version.c	2011-02-09 17:09:26.000000000 +0100
85ff02c
--- src/version.c	2011-02-09 17:41:37.000000000 +0100
85ff02c
***************
85ff02c
*** 716,717 ****
85ff02c
--- 716,719 ----
85ff02c
  {   /* Add new patch number below this line */
85ff02c
+ /**/
85ff02c
+     117,
85ff02c
  /**/
85ff02c
85ff02c
-- 
85ff02c
hundred-and-one symptoms of being an internet addict:
85ff02c
220. Your wife asks for sex and you tell her where to find you on IRC.
85ff02c
85ff02c
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
85ff02c
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
85ff02c
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
85ff02c
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///