updated for version 7.0-123
diff --git a/src/auto/configure b/src/auto/configure
index 1e3d8ec..c941bc0 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -4256,7 +4256,7 @@
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 @@
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 3e8bf34..9842fff 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -681,7 +681,8 @@
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 @@
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 afb16d2..5ebaecc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 123,
+/**/
122,
/**/
121,
