Mercurial > vim
changeset 997:86289e90a4bb v7.0.123
updated for version 7.0-123
| author | vimboss |
|---|---|
| date | Tue, 10 Oct 2006 09:41:28 +0000 |
| parents | 5858c00d0f2c |
| children | f49d72bf9c5c |
| files | src/auto/configure src/configure.in src/version.c |
| diffstat | 3 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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