Patch 8.2.4686

[Bram Moolenaar]

Patch 8.2.4686
Problem: Configure doesn't find the Motif library with Cygwin.
Solution: Check for libXm.dll.a. (Kelvin Lee, closes #10077)
Files: src/configure.ac, src/auto/configure


*** ../vim-8.2.4685/src/configure.ac 2022-03-12 11:57:21.729327845 +0000
--- src/configure.ac 2022-04-04 17:11:36.779298547 +0100
***************
*** 2965,2975 ****

dnl Ubuntu has libXm.so in /usr/lib/i386-linux-gnu and elsewhere. The
dnl linker will figure out which one to use, we only check if one exists.
AC_MSG_CHECKING(for location of Motif GUI libs)
gui_libs="`echo $x_libraries|sed 's%/[^/][^/]*$%%'` `echo "$gui_XXX" | sed s/XXX/lib/g` /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC"
GUI_LIB_LOC=
for try in $gui_libs; do
! for libtry in "$try"/libXm.a "$try"/libXm.so* "$try"/libXm.sl "$try"/libXm.dylib; do
if test -f "$libtry"; then
GUI_LIB_LOC=$try
fi
--- 2965,2976 ----

dnl Ubuntu has libXm.so in /usr/lib/i386-linux-gnu and elsewhere. The
dnl linker will figure out which one to use, we only check if one exists.
+ dnl Cygwin uses the .dll.a extension.
AC_MSG_CHECKING(for location of Motif GUI libs)
gui_libs="`echo $x_libraries|sed 's%/[^/][^/]*$%%'` `echo "$gui_XXX" | sed s/XXX/lib/g` /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC"
GUI_LIB_LOC=
for try in $gui_libs; do
! for libtry in "$try"/libXm.a "$try"/libXm.dll.a "$try"/libXm.so* "$try"/libXm.sl "$try"/libXm.dylib; do
if test -f "$libtry"; then
GUI_LIB_LOC=$try
fi
*** ../vim-8.2.4685/src/auto/configure 2022-03-12 11:57:21.733327834 +0000
--- src/auto/configure 2022-04-04 17:13:34.183398352 +0100
***************
*** 10212,10223 ****

GUI_LIB_LOC="`echo $GUI_LIB_LOC|sed 's%-L%%g'`"

! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Motif GUI libs" >&5
$as_echo_n "checking for location of Motif GUI libs... " >&6; }
gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/lib/g` /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC"
GUI_LIB_LOC=
for try in $gui_libs; do
! for libtry in "$try"/libXm.a "$try"/libXm.so* "$try"/libXm.sl "$try"/libXm.dylib; do
if test -f "$libtry"; then
GUI_LIB_LOC=$try
fi
--- 10212,10223 ----

GUI_LIB_LOC="`echo $GUI_LIB_LOC|sed 's%-L%%g'`"

! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Motif GUI libs" >&5
$as_echo_n "checking for location of Motif GUI libs... " >&6; }
gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/lib/g` /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC"
GUI_LIB_LOC=
for try in $gui_libs; do
! for libtry in "$try"/libXm.a "$try"/libXm.dll.a "$try"/libXm.so* "$try"/libXm.sl "$try"/libXm.dylib; do
if test -f "$libtry"; then
GUI_LIB_LOC=$try
fi
*** ../vim-8.2.4685/src/version.c 2022-04-04 16:56:50.776629692 +0100
--- src/version.c 2022-04-04 17:13:42.683404499 +0100
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 4686,
/**/

--
Men may not be seen publicly in any kind of strapless gown.
[real standing law in Florida, United States of America]

/// 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 ///