projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| f3c378e8 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.0.123 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.0.123 | |
| 11 | Problem: On SCO Openserver configure selects the wrong terminal library. | |
| 12 | Solution: Put terminfo before the other libraries. (Roger Cornelius) | |
| 13 | Also fix a small problem compiling on Mac without Darwin. | |
| 14 | Files: src/configure.in, src/auto/configure | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.0.122/src/configure.in Tue Sep 5 17:30:25 2006 | |
| 18 | --- src/configure.in Thu Oct 5 22:01:13 2006 | |
| 19 | *************** | |
| 20 | *** 681,687 **** | |
| 21 | AC_MSG_CHECKING([if -pthread should be used]) | |
| 22 | threadsafe_flag= | |
| 23 | thread_lib= | |
| 24 | ! if test "x$MACOSX" != "xyes"; then | |
| 25 | test "$GCC" = yes && threadsafe_flag="-pthread" | |
| 26 | if test "`(uname) 2>/dev/null`" = FreeBSD; then | |
| 27 | threadsafe_flag="-D_THREAD_SAFE" | |
| 28 | --- 681,688 ---- | |
| 29 | AC_MSG_CHECKING([if -pthread should be used]) | |
| 30 | threadsafe_flag= | |
| 31 | thread_lib= | |
| 32 | ! dnl if test "x$MACOSX" != "xyes"; then | |
| 33 | ! if test "`(uname) 2>/dev/null`" != Darwin; then | |
| 34 | test "$GCC" = yes && threadsafe_flag="-pthread" | |
| 35 | if test "`(uname) 2>/dev/null`" = FreeBSD; then | |
| 36 | threadsafe_flag="-D_THREAD_SAFE" | |
| 37 | *************** | |
| 38 | *** 2151,2158 **** | |
| 39 | dnl Newer versions of ncurses are preferred over anything. | |
| 40 | dnl Older versions of ncurses have bugs, get a new one! | |
| 41 | dnl Digital Unix (OSF1) should use curses (Ronald Schild). | |
| 42 | case "`uname -s 2>/dev/null`" in | |
| 43 | ! OSF1) tlibs="ncurses curses termlib termcap";; | |
| 44 | *) tlibs="ncurses termlib termcap curses";; | |
| 45 | esac | |
| 46 | for libname in $tlibs; do | |
| 47 | --- 2152,2160 ---- | |
| 48 | dnl Newer versions of ncurses are preferred over anything. | |
| 49 | dnl Older versions of ncurses have bugs, get a new one! | |
| 50 | dnl Digital Unix (OSF1) should use curses (Ronald Schild). | |
| 51 | + dnl On SCO Openserver should prefer termlib (Roger Cornelius). | |
| 52 | case "`uname -s 2>/dev/null`" in | |
| 53 | ! OSF1|SCO_SV) tlibs="ncurses curses termlib termcap";; | |
| 54 | *) tlibs="ncurses termlib termcap curses";; | |
| 55 | esac | |
| 56 | for libname in $tlibs; do | |
| 57 | *** ../vim-7.0.122/src/auto/configure Tue Sep 5 17:30:25 2006 | |
| 58 | --- src/auto/configure Thu Oct 5 22:02:45 2006 | |
| 59 | *************** | |
| 60 | *** 4256,4262 **** | |
| 61 | echo $ECHO_N "checking if -pthread should be used... $ECHO_C" >&6 | |
| 62 | threadsafe_flag= | |
| 63 | thread_lib= | |
| 64 | ! if test "x$MACOSX" != "xyes"; then | |
| 65 | test "$GCC" = yes && threadsafe_flag="-pthread" | |
| 66 | if test "`(uname) 2>/dev/null`" = FreeBSD; then | |
| 67 | threadsafe_flag="-D_THREAD_SAFE" | |
| 68 | --- 4256,4262 ---- | |
| 69 | echo $ECHO_N "checking if -pthread should be used... $ECHO_C" >&6 | |
| 70 | threadsafe_flag= | |
| 71 | thread_lib= | |
| 72 | ! if test "`(uname) 2>/dev/null`" != Darwin; then | |
| 73 | test "$GCC" = yes && threadsafe_flag="-pthread" | |
| 74 | if test "`(uname) 2>/dev/null`" = FreeBSD; then | |
| 75 | threadsafe_flag="-D_THREAD_SAFE" | |
| 76 | *************** | |
| 77 | *** 11555,11562 **** | |
| 78 | else | |
| 79 | echo "$as_me:$LINENO: result: empty: automatic terminal library selection" >&5 | |
| 80 | echo "${ECHO_T}empty: automatic terminal library selection" >&6 | |
| 81 | ! case "`uname -s 2>/dev/null`" in | |
| 82 | ! OSF1) tlibs="ncurses curses termlib termcap";; | |
| 83 | *) tlibs="ncurses termlib termcap curses";; | |
| 84 | esac | |
| 85 | for libname in $tlibs; do | |
| 86 | --- 11555,11562 ---- | |
| 87 | else | |
| 88 | echo "$as_me:$LINENO: result: empty: automatic terminal library selection" >&5 | |
| 89 | echo "${ECHO_T}empty: automatic terminal library selection" >&6 | |
| 90 | ! case "`uname -s 2>/dev/null`" in | |
| 91 | ! OSF1|SCO_SV) tlibs="ncurses curses termlib termcap";; | |
| 92 | *) tlibs="ncurses termlib termcap curses";; | |
| 93 | esac | |
| 94 | for libname in $tlibs; do | |
| 95 | *** ../vim-7.0.122/src/version.c Mon Oct 9 22:11:52 2006 | |
| 96 | --- src/version.c Tue Oct 10 11:37:26 2006 | |
| 97 | *************** | |
| 98 | *** 668,669 **** | |
| 99 | --- 668,671 ---- | |
| 100 | { /* Add new patch number below this line */ | |
| 101 | + /**/ | |
| 102 | + 123, | |
| 103 | /**/ | |
| 104 | ||
| 105 | -- | |
| 106 | How To Keep A Healthy Level Of Insanity: | |
| 107 | 12. Sing along at the opera. | |
| 108 | ||
| 109 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 110 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 111 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 112 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |