updated for version 7.0-123

diff --git a/src/auto/configure b/src/auto/configure
index 1e3d8ec5a76351411e7748d88ad45e1a5c061595..c941bc0db93dc4b988f5e52ccb4c28b441244187 100755 (executable)
--- 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 3e8bf34b748cb0238762c3369f672b92f5b00d89..9842fff8a05236450bb61568217ee38e10f6eed9 100644 (file)
--- 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 afb16d2e458cc326200d5a5d8837bad6b84a09e8..5ebaecc1894408e25fb7e524a147323311b35034 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    123,
 /**/
     122,
 /**/