diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-10-10 09:41:28 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-10-10 09:41:28 +0000 |
| commit | a1b5aa52c480badce208a67f236005762e991329 (patch) | |
| tree | 9096f6429106d8edf03b2dd8748aa09b8f035d1a | |
| parent | 9c69732279b0d8a61cdbc564c103622a0891edeb (diff) | |
updated for version 7.0-123v7.0.123
| -rwxr-xr-x | src/auto/configure | 6 | ||||
| -rw-r--r-- | src/configure.in | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/auto/configure b/src/auto/configure index 1e3d8ec5a7..c941bc0db9 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -4256,7 +4256,7 @@ fi echo $ECHO_N "checking if -pthread should be used... $ECHO_C" >&6 threadsafe_flag= thread_lib= - if test "x$MACOSX" != "xyes"; then + if test "`(uname) 2>/dev/null`" != Darwin; then test "$GCC" = yes && threadsafe_flag="-pthread" if test "`(uname) 2>/dev/null`" = FreeBSD; then threadsafe_flag="-D_THREAD_SAFE" @@ -11555,8 +11555,8 @@ rm -f conftest.err conftest.$ac_objext \ else echo "$as_me:$LINENO: result: empty: automatic terminal library selection" >&5 echo "${ECHO_T}empty: automatic terminal library selection" >&6 - case "`uname -s 2>/dev/null`" in - OSF1) tlibs="ncurses curses termlib termcap";; + case "`uname -s 2>/dev/null`" in + OSF1|SCO_SV) tlibs="ncurses curses termlib termcap";; *) tlibs="ncurses termlib termcap curses";; esac for libname in $tlibs; do diff --git a/src/configure.in b/src/configure.in index 3e8bf34b74..9842fff8a0 100644 --- a/src/configure.in +++ b/src/configure.in @@ -681,7 +681,8 @@ eof AC_MSG_CHECKING([if -pthread should be used]) threadsafe_flag= thread_lib= - if test "x$MACOSX" != "xyes"; then + dnl if test "x$MACOSX" != "xyes"; then + if test "`(uname) 2>/dev/null`" != Darwin; then test "$GCC" = yes && threadsafe_flag="-pthread" if test "`(uname) 2>/dev/null`" = FreeBSD; then threadsafe_flag="-D_THREAD_SAFE" @@ -2151,8 +2152,9 @@ else dnl Newer versions of ncurses are preferred over anything. 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) tlibs="ncurses curses termlib termcap";; + OSF1|SCO_SV) tlibs="ncurses curses termlib termcap";; *) tlibs="ncurses termlib termcap curses";; esac for libname in $tlibs; do diff --git a/src/version.c b/src/version.c index afb16d2e45..5ebaecc189 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 123, +/**/ 122, /**/ 121, |