Patch 8.2.3800

[Bram Moolenaar]

Patch 8.2.3800
Problem: When cross compiling the output of "uname" cannot be set. (Ben
Reeves)
Solution: Use cache variables. (closes #9338)
Files: src/configure.ac, src/auto/configure


*** ../vim-8.2.3799/src/configure.ac 2021-11-19 11:27:49.099056921 +0000
--- src/configure.ac 2021-12-13 20:34:53.436737942 +0000
***************
*** 159,166 ****

OS_EXTRA_SRC=""; OS_EXTRA_OBJ=""

AC_MSG_CHECKING(for Haiku)
! case `uname` in
Haiku) HAIKU=yes; AC_MSG_RESULT(yes);;
*) HAIKU=no; AC_MSG_RESULT(no);;
esac
--- 159,192 ----

OS_EXTRA_SRC=""; OS_EXTRA_OBJ=""

+ dnl When cross-compiling set $vim_cv_uname_output, $vim_cv_uname_r_output and
+ dnl $vim_cv_uname_m_output to the desired value for the target system
+ AC_MSG_CHECKING(uname)
+ if test "x$vim_cv_uname_output" = "x" ; then
+ vim_cv_uname_output=`(uname) 2>/dev/null`
+ AC_MSG_RESULT($vim_cv_uname_output)
+ else
+ AC_MSG_RESULT([$vim_cv_uname_output (cached)])
+ fi
+
+ AC_MSG_CHECKING(uname -r)
+ if test "x$vim_cv_uname_r_output" = "x" ; then
+ vim_cv_uname_r_output=`(uname -r) 2>/dev/null`
+ AC_MSG_RESULT($vim_cv_uname_r_output)
+ else
+ AC_MSG_RESULT([$vim_cv_uname_r_output (cached)])
+ fi
+
+ AC_MSG_CHECKING(uname -m)
+ if test "x$vim_cv_uname_m_output" = "x" ; then
+ vim_cv_uname_m_output=`(uname -m) 2>/dev/null`
+ AC_MSG_RESULT($vim_cv_uname_m_output)
+ else
+ AC_MSG_RESULT([$vim_cv_uname_m_output (cached)])
+ fi
+
AC_MSG_CHECKING(for Haiku)
! case $vim_cv_uname_output in
Haiku) HAIKU=yes; AC_MSG_RESULT(yes);;
*) HAIKU=no; AC_MSG_RESULT(no);;
esac
***************
*** 168,174 ****
dnl If QNX is found, assume we don't want to use Xphoton
dnl unless it was specifically asked for (--with-x)
AC_MSG_CHECKING(for QNX)
! case `uname` in
QNX) OS_EXTRA_SRC=os_qnx.c; OS_EXTRA_OBJ=objects/os_qnx.o
test -z "$with_x" && with_x=no
QNX=yes; AC_MSG_RESULT(yes);;
--- 194,200 ----
dnl If QNX is found, assume we don't want to use Xphoton
dnl unless it was specifically asked for (--with-x)
AC_MSG_CHECKING(for QNX)
! case $vim_cv_uname_output in
QNX) OS_EXTRA_SRC=os_qnx.c; OS_EXTRA_OBJ=objects/os_qnx.o
test -z "$with_x" && with_x=no
QNX=yes; AC_MSG_RESULT(yes);;
***************
*** 179,185 ****
dnl We do a check for MacOS X in the very beginning because there
dnl are a lot of other things we need to change besides GUI stuff
AC_MSG_CHECKING([for Darwin (Mac OS X)])
! if test "`(uname) 2>/dev/null`" = Darwin; then
AC_MSG_RESULT(yes)
MACOS_X=yes
CPPFLAGS="$CPPFLAGS -DMACOS_X"
--- 205,211 ----
dnl We do a check for MacOS X in the very beginning because there
dnl are a lot of other things we need to change besides GUI stuff
AC_MSG_CHECKING([for Darwin (Mac OS X)])
! if test "$vim_cv_uname_output" = Darwin; then
AC_MSG_RESULT(yes)
MACOS_X=yes
CPPFLAGS="$CPPFLAGS -DMACOS_X"
***************
*** 395,401 ****
if test "$cf_cv_ebcdic" = "yes"; then
dnl If we have EBCDIC we most likely have z/OS Unix, let's test it!
AC_MSG_CHECKING(for z/OS Unix)
! case `uname` in
OS/390) zOSUnix="yes";
dnl If using cc the environment variable _CC_CCMODE must be
dnl set to "1", so that some compiler extensions are enabled.
--- 421,427 ----
if test "$cf_cv_ebcdic" = "yes"; then
dnl If we have EBCDIC we most likely have z/OS Unix, let's test it!
AC_MSG_CHECKING(for z/OS Unix)
! case $vim_cv_uname_output in
OS/390) zOSUnix="yes";
dnl If using cc the environment variable _CC_CCMODE must be
dnl set to "1", so that some compiler extensions are enabled.
***************
*** 742,748 ****
fi
if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \
test "x$MACOS_X" = "xyes" && test "x$vi_cv_with_luajit" != "xno" && \
! test "`(uname -m) 2>/dev/null`" = "x86_64"; then
dnl OSX/x64 requires these flags. See http://luajit.org/install.html
LUA_LIBS="-pagezero_size 10000 -image_base 100000000 $LUA_LIBS"
fi
--- 768,774 ----
fi
if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \
test "x$MACOS_X" = "xyes" && test "x$vi_cv_with_luajit" != "xno" && \
! test "$vim_cv_uname_m_output" = "x86_64"; then
dnl OSX/x64 requires these flags. See http://luajit.org/install.html
LUA_LIBS="-pagezero_size 10000 -image_base 100000000 $LUA_LIBS"
fi
***************
*** 910,917 ****
dnl Make Vim remember the path to the library. For when it's not in
dnl $LD_LIBRARY_PATH.
MZSCHEME_LIBS="${MZSCHEME_LIBS} -Wl,-rpath -Wl,${path}"
! elif test "`(uname) 2>/dev/null`" = SunOS &&
! uname -r | grep '^5' >/dev/null; then
MZSCHEME_LIBS="${MZSCHEME_LIBS} -R ${path}"
fi
fi
--- 936,943 ----
dnl Make Vim remember the path to the library. For when it's not in
dnl $LD_LIBRARY_PATH.
MZSCHEME_LIBS="${MZSCHEME_LIBS} -Wl,-rpath -Wl,${path}"
! elif test "$vim_cv_uname_output" = SunOS &&
! echo $vim_cv_uname_r_output | grep '^5' >/dev/null; then
MZSCHEME_LIBS="${MZSCHEME_LIBS} -R ${path}"
fi
fi
***************
*** 1349,1361 ****
threadsafe_flag=
thread_lib=
dnl if test "x$MACOS_X" != "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"
thread_lib="-pthread"
fi
! if test "`(uname) 2>/dev/null`" = SunOS; then
threadsafe_flag="-pthreads"
fi
fi
--- 1375,1387 ----
threadsafe_flag=
thread_lib=
dnl if test "x$MACOS_X" != "xyes"; then
! if test "$vim_cv_uname_output" != Darwin; then
test "$GCC" = yes && threadsafe_flag="-pthread"
! if test "$vim_cv_uname_output" = FreeBSD; then
threadsafe_flag="-D_THREAD_SAFE"
thread_lib="-pthread"
fi
! if test "$vim_cv_uname_output" = SunOS; then
threadsafe_flag="-pthreads"
fi
fi
***************
*** 1567,1579 ****
threadsafe_flag=
thread_lib=
dnl if test "x$MACOS_X" != "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"
thread_lib="-pthread"
fi
! if test "`(uname) 2>/dev/null`" = SunOS; then
threadsafe_flag="-pthreads"
fi
fi
--- 1593,1605 ----
threadsafe_flag=
thread_lib=
dnl if test "x$MACOS_X" != "xyes"; then
! if test "$vim_cv_uname_output" != Darwin; then
test "$GCC" = yes && threadsafe_flag="-pthread"
! if test "$vim_cv_uname_output" = FreeBSD; then
threadsafe_flag="-D_THREAD_SAFE"
thread_lib="-pthread"
fi
! if test "$vim_cv_uname_output" = SunOS; then
threadsafe_flag="-pthreads"
fi
fi
***************
*** 1880,1887 ****
if test -f "$try/lib$trylib" ; then
AC_MSG_RESULT($try/lib$trylib)
TCL_LIBS="-L\"$try\" -ltcl$ver -ldl -lm"
! if test "`(uname) 2>/dev/null`" = SunOS &&
! uname -r | grep '^5' >/dev/null; then
TCL_LIBS="$TCL_LIBS -R $try"
fi
break 3
--- 1906,1913 ----
if test -f "$try/lib$trylib" ; then
AC_MSG_RESULT($try/lib$trylib)
TCL_LIBS="-L\"$try\" -ltcl$ver -ldl -lm"
! if test "$vim_cv_uname_output" = SunOS &&
! echo $vim_cv_uname_r_output | grep '^5' >/dev/null; then
TCL_LIBS="$TCL_LIBS -R $try"
fi
break 3
***************
*** 2281,2288 ****
x_libraries=`echo "$x_includes" | sed s/include/lib/`
AC_MSG_RESULT(Corrected X libraries to $x_libraries)
X_LIBS="$X_LIBS -L$x_libraries"
! if test "`(uname) 2>/dev/null`" = SunOS &&
! uname -r | grep '^5' >/dev/null; then
X_LIBS="$X_LIBS -R $x_libraries"
fi
fi
--- 2307,2314 ----
x_libraries=`echo "$x_includes" | sed s/include/lib/`
AC_MSG_RESULT(Corrected X libraries to $x_libraries)
X_LIBS="$X_LIBS -L$x_libraries"
! if test "$vim_cv_uname_output" = SunOS &&
! echo $vim_cv_uname_r_output | grep '^5' >/dev/null; then
X_LIBS="$X_LIBS -R $x_libraries"
fi
fi
***************
*** 2719,2725 ****
dnl On FreeBSD we need -pthread but pkg-config doesn't include it.
dnl This might not be the right way but it works for me...
AC_MSG_CHECKING(for FreeBSD)
! if test "`(uname) 2>/dev/null`" = FreeBSD; then
AC_MSG_RESULT(yes, adding -pthread)
GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR -D_THREAD_SAFE"
GNOME_LIBS="$GNOME_LIBS -pthread"
--- 2745,2751 ----
dnl On FreeBSD we need -pthread but pkg-config doesn't include it.
dnl This might not be the right way but it works for me...
AC_MSG_CHECKING(for FreeBSD)
! if test "$vim_cv_uname_output" = FreeBSD; then
AC_MSG_RESULT(yes, adding -pthread)
GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR -D_THREAD_SAFE"
GNOME_LIBS="$GNOME_LIBS -pthread"
***************
*** 2971,2978 ****
else
if test -n "$GUI_LIB_LOC"; then
AC_MSG_RESULT($GUI_LIB_LOC)
! if test "`(uname) 2>/dev/null`" = SunOS &&
! uname -r | grep '^5' >/dev/null; then
GUI_LIB_LOC="$GUI_LIB_LOC -R $GUI_LIB_LOC"
fi
fi
--- 2997,3004 ----
else
if test -n "$GUI_LIB_LOC"; then
AC_MSG_RESULT($GUI_LIB_LOC)
! if test "$vim_cv_uname_output" = SunOS &&
! echo $vim_cv_uname_r_output | grep '^5' >/dev/null; then
GUI_LIB_LOC="$GUI_LIB_LOC -R $GUI_LIB_LOC"
fi
fi
***************
*** 3215,3221 ****

dnl Check for Cygwin, which needs an extra source file if not using X11
AC_MSG_CHECKING(for CYGWIN or MSYS environment)
! case `uname` in
CYGWIN*|MSYS*) CYGWIN=yes; AC_MSG_RESULT(yes)
AC_MSG_CHECKING(for CYGWIN clipboard support)
if test "x$with_x" = "xno" ; then
--- 3241,3247 ----

dnl Check for Cygwin, which needs an extra source file if not using X11
AC_MSG_CHECKING(for CYGWIN or MSYS environment)
! case $vim_cv_uname_output in
CYGWIN*|MSYS*) CYGWIN=yes; AC_MSG_RESULT(yes)
AC_MSG_CHECKING(for CYGWIN clipboard support)
if test "x$with_x" = "xno" ; then
***************
*** 3446,3452 ****
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|SCO_SV) tlibs="tinfo ncurses curses termlib termcap";;
*) tlibs="tinfo ncurses termlib termcap curses";;
esac
--- 3472,3478 ----
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 "$vim_cv_uname_output" in
OSF1|SCO_SV) tlibs="tinfo ncurses curses termlib termcap";;
*) tlibs="tinfo ncurses termlib termcap curses";;
esac
*** ../vim-8.2.3799/src/auto/configure 2021-11-19 11:27:49.103056914 +0000
--- src/auto/configure 2021-12-13 20:34:57.924733695 +0000
***************
*** 4545,4553 ****

OS_EXTRA_SRC=""; OS_EXTRA_OBJ=""

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Haiku" >&5
$as_echo_n "checking for Haiku... " >&6; }
! case `uname` in
Haiku) HAIKU=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; };;
*) HAIKU=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--- 4545,4586 ----

OS_EXTRA_SRC=""; OS_EXTRA_OBJ=""

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking uname" >&5
+ $as_echo_n "checking uname... " >&6; }
+ if test "x$vim_cv_uname_output" = "x" ; then
+ vim_cv_uname_output=`(uname) 2>/dev/null`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_output" >&5
+ $as_echo "$vim_cv_uname_output" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_output (cached)" >&5
+ $as_echo "$vim_cv_uname_output (cached)" >&6; }
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -r" >&5
+ $as_echo_n "checking uname -r... " >&6; }
+ if test "x$vim_cv_uname_r_output" = "x" ; then
+ vim_cv_uname_r_output=`(uname -r) 2>/dev/null`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_r_output" >&5
+ $as_echo "$vim_cv_uname_r_output" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_r_output (cached)" >&5
+ $as_echo "$vim_cv_uname_r_output (cached)" >&6; }
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -m" >&5
+ $as_echo_n "checking uname -m... " >&6; }
+ if test "x$vim_cv_uname_m_output" = "x" ; then
+ vim_cv_uname_m_output=`(uname -m) 2>/dev/null`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_m_output" >&5
+ $as_echo "$vim_cv_uname_m_output" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_m_output (cached)" >&5
+ $as_echo "$vim_cv_uname_m_output (cached)" >&6; }
+ fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Haiku" >&5
$as_echo_n "checking for Haiku... " >&6; }
! case $vim_cv_uname_output in
Haiku) HAIKU=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; };;
*) HAIKU=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
***************
*** 4556,4562 ****

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QNX" >&5
$as_echo_n "checking for QNX... " >&6; }
! case `uname` in
QNX) OS_EXTRA_SRC=os_qnx.c; OS_EXTRA_OBJ=objects/os_qnx.o
test -z "$with_x" && with_x=no
QNX=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--- 4589,4595 ----

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QNX" >&5
$as_echo_n "checking for QNX... " >&6; }
! case $vim_cv_uname_output in
QNX) OS_EXTRA_SRC=os_qnx.c; OS_EXTRA_OBJ=objects/os_qnx.o
test -z "$with_x" && with_x=no
QNX=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
***************
*** 4567,4573 ****

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Darwin (Mac OS X)" >&5
$as_echo_n "checking for Darwin (Mac OS X)... " >&6; }
! if test "`(uname) 2>/dev/null`" = Darwin; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
MACOS_X=yes
--- 4600,4606 ----

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Darwin (Mac OS X)" >&5
$as_echo_n "checking for Darwin (Mac OS X)... " >&6; }
! if test "$vim_cv_uname_output" = Darwin; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
MACOS_X=yes
***************
*** 4968,4974 ****
if test "$cf_cv_ebcdic" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for z/OS Unix" >&5
$as_echo_n "checking for z/OS Unix... " >&6; }
! case `uname` in
OS/390) zOSUnix="yes";
if test "$CC" = "cc"; then
ccm="$_CC_CCMODE"
--- 5001,5007 ----
if test "$cf_cv_ebcdic" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for z/OS Unix" >&5
$as_echo_n "checking for z/OS Unix... " >&6; }
! case $vim_cv_uname_output in
OS/390) zOSUnix="yes";
if test "$CC" = "cc"; then
ccm="$_CC_CCMODE"
***************
*** 5613,5619 ****
fi
if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \
test "x$MACOS_X" = "xyes" && test "x$vi_cv_with_luajit" != "xno" && \
! test "`(uname -m) 2>/dev/null`" = "x86_64"; then
LUA_LIBS="-pagezero_size 10000 -image_base 100000000 $LUA_LIBS"
fi
fi
--- 5646,5652 ----
fi
if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \
test "x$MACOS_X" = "xyes" && test "x$vi_cv_with_luajit" != "xno" && \
! test "$vim_cv_uname_m_output" = "x86_64"; then
LUA_LIBS="-pagezero_size 10000 -image_base 100000000 $LUA_LIBS"
fi
fi
***************
*** 5850,5857 ****
fi
if test "$GCC" = yes; then
MZSCHEME_LIBS="${MZSCHEME_LIBS} -Wl,-rpath -Wl,${path}"
! elif test "`(uname) 2>/dev/null`" = SunOS &&
! uname -r | grep '^5' >/dev/null; then
MZSCHEME_LIBS="${MZSCHEME_LIBS} -R ${path}"
fi
fi
--- 5883,5890 ----
fi
if test "$GCC" = yes; then
MZSCHEME_LIBS="${MZSCHEME_LIBS} -Wl,-rpath -Wl,${path}"
! elif test "$vim_cv_uname_output" = SunOS &&
! echo $vim_cv_uname_r_output | grep '^5' >/dev/null; then
MZSCHEME_LIBS="${MZSCHEME_LIBS} -R ${path}"
fi
fi
***************
*** 6492,6504 ****
$as_echo_n "checking if -pthread should be used... " >&6; }
threadsafe_flag=
thread_lib=
! 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"
thread_lib="-pthread"
fi
! if test "`(uname) 2>/dev/null`" = SunOS; then
threadsafe_flag="-pthreads"
fi
fi
--- 6525,6537 ----
$as_echo_n "checking if -pthread should be used... " >&6; }
threadsafe_flag=
thread_lib=
! if test "$vim_cv_uname_output" != Darwin; then
test "$GCC" = yes && threadsafe_flag="-pthread"
! if test "$vim_cv_uname_output" = FreeBSD; then
threadsafe_flag="-D_THREAD_SAFE"
thread_lib="-pthread"
fi
! if test "$vim_cv_uname_output" = SunOS; then
threadsafe_flag="-pthreads"
fi
fi
***************
*** 6840,6852 ****
$as_echo_n "checking if -pthread should be used... " >&6; }
threadsafe_flag=
thread_lib=
! 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"
thread_lib="-pthread"
fi
! if test "`(uname) 2>/dev/null`" = SunOS; then
threadsafe_flag="-pthreads"
fi
fi
--- 6873,6885 ----
$as_echo_n "checking if -pthread should be used... " >&6; }
threadsafe_flag=
thread_lib=
! if test "$vim_cv_uname_output" != Darwin; then
test "$GCC" = yes && threadsafe_flag="-pthread"
! if test "$vim_cv_uname_output" = FreeBSD; then
threadsafe_flag="-D_THREAD_SAFE"
thread_lib="-pthread"
fi
! if test "$vim_cv_uname_output" = SunOS; then
threadsafe_flag="-pthreads"
fi
fi
***************
*** 7470,7477 ****
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/lib$trylib" >&5
$as_echo "$try/lib$trylib" >&6; }
TCL_LIBS="-L\"$try\" -ltcl$ver -ldl -lm"
! if test "`(uname) 2>/dev/null`" = SunOS &&
! uname -r | grep '^5' >/dev/null; then
TCL_LIBS="$TCL_LIBS -R $try"
fi
break 3
--- 7503,7510 ----
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/lib$trylib" >&5
$as_echo "$try/lib$trylib" >&6; }
TCL_LIBS="-L\"$try\" -ltcl$ver -ldl -lm"
! if test "$vim_cv_uname_output" = SunOS &&
! echo $vim_cv_uname_r_output | grep '^5' >/dev/null; then
TCL_LIBS="$TCL_LIBS -R $try"
fi
break 3
***************
*** 8911,8918 ****
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Corrected X libraries to $x_libraries" >&5
$as_echo "Corrected X libraries to $x_libraries" >&6; }
X_LIBS="$X_LIBS -L$x_libraries"
! if test "`(uname) 2>/dev/null`" = SunOS &&
! uname -r | grep '^5' >/dev/null; then
X_LIBS="$X_LIBS -R $x_libraries"
fi
fi
--- 8944,8951 ----
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Corrected X libraries to $x_libraries" >&5
$as_echo "Corrected X libraries to $x_libraries" >&6; }
X_LIBS="$X_LIBS -L$x_libraries"
! if test "$vim_cv_uname_output" = SunOS &&
! echo $vim_cv_uname_r_output | grep '^5' >/dev/null; then
X_LIBS="$X_LIBS -R $x_libraries"
fi
fi
***************
*** 9736,9742 ****

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FreeBSD" >&5
$as_echo_n "checking for FreeBSD... " >&6; }
! if test "`(uname) 2>/dev/null`" = FreeBSD; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR -D_THREAD_SAFE"
--- 9769,9775 ----

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FreeBSD" >&5
$as_echo_n "checking for FreeBSD... " >&6; }
! if test "$vim_cv_uname_output" = FreeBSD; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR -D_THREAD_SAFE"
***************
*** 10220,10227 ****
if test -n "$GUI_LIB_LOC"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GUI_LIB_LOC" >&5
$as_echo "$GUI_LIB_LOC" >&6; }
! if test "`(uname) 2>/dev/null`" = SunOS &&
! uname -r | grep '^5' >/dev/null; then
GUI_LIB_LOC="$GUI_LIB_LOC -R $GUI_LIB_LOC"
fi
fi
--- 10253,10260 ----
if test -n "$GUI_LIB_LOC"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GUI_LIB_LOC" >&5
$as_echo "$GUI_LIB_LOC" >&6; }
! if test "$vim_cv_uname_output" = SunOS &&
! echo $vim_cv_uname_r_output | grep '^5' >/dev/null; then
GUI_LIB_LOC="$GUI_LIB_LOC -R $GUI_LIB_LOC"
fi
fi
***************
*** 10768,10774 ****

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN or MSYS environment" >&5
$as_echo_n "checking for CYGWIN or MSYS environment... " >&6; }
! case `uname` in
CYGWIN*|MSYS*) CYGWIN=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN clipboard support" >&5
--- 10801,10807 ----

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN or MSYS environment" >&5
$as_echo_n "checking for CYGWIN or MSYS environment... " >&6; }
! case $vim_cv_uname_output in
CYGWIN*|MSYS*) CYGWIN=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN clipboard support" >&5
***************
*** 11965,11971 ****
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: empty: automatic terminal library selection" >&5
$as_echo "empty: automatic terminal library selection" >&6; }
! case "`uname -s 2>/dev/null`" in
OSF1|SCO_SV) tlibs="tinfo ncurses curses termlib termcap";;
*) tlibs="tinfo ncurses termlib termcap curses";;
esac
--- 11998,12004 ----
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: empty: automatic terminal library selection" >&5
$as_echo "empty: automatic terminal library selection" >&6; }
! case "$vim_cv_uname_output" in
OSF1|SCO_SV) tlibs="tinfo ncurses curses termlib termcap";;
*) tlibs="tinfo ncurses termlib termcap curses";;
esac
*** ../vim-8.2.3799/src/version.c 2021-12-13 19:14:48.597409503 +0000
--- src/version.c 2021-12-13 20:36:30.192645536 +0000
***************
*** 751,752 ****
--- 751,754 ----
{ /* Add new patch number below this line */
+ /**/
+ 3800,
/**/

--
'Well, here's something to occupy you and keep your mind off things.'
'It won't work, I have an exceptionally large mind.'
-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///