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