Patch 9.0.1445
Problem: openSUSE: configure doesn't find the Motif library. (Tony
Mechelynck)
Solution: Also search in /usr/lib64.
Files: src/configure.ac, src/auto/configure
*** ../vim-9.0.1444/src/configure.ac 2023-04-05 18:24:46.140030379 +0100
--- src/configure.ac 2023-04-11 22:08:03.801018102 +0100
***************
*** 2976,2983 ****
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
--- 2976,2984 ----
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.
+ dnl OpenSUSE appears to use /usr/lib64.
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/lib64 /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
***************
*** 2987,2994 ****
done
done
if test -n "$GUI_LIB_LOC"; then
! dnl Remove /usr/lib, it causes trouble on some systems
if test "$GUI_LIB_LOC" = /usr/lib \
-o "$GUI_LIB_LOC" = /usr/lib/i386-linux-gnu \
-o "$GUI_LIB_LOC" = /usr/lib/x86_64-linux-gnu; then
GUI_LIB_LOC=
--- 2988,2997 ----
done
done
if test -n "$GUI_LIB_LOC"; then
! dnl Remove /usr/lib, it causes trouble on some systems.
! dnl For consistency also remove other standard lib directories.
if test "$GUI_LIB_LOC" = /usr/lib \
+ -o "$GUI_LIB_LOC" = /usr/lib64 \
-o "$GUI_LIB_LOC" = /usr/lib/i386-linux-gnu \
-o "$GUI_LIB_LOC" = /usr/lib/x86_64-linux-gnu; then
GUI_LIB_LOC=
*** ../vim-9.0.1444/src/auto/configure 2023-04-05 18:24:46.144030386 +0100
--- src/auto/configure 2023-04-12 16:23:19.360688274 +0100
***************
*** 10216,10224 ****
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
--- 10216,10224 ----
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/lib64 /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
***************
*** 10228,10234 ****
done
done
if test -n "$GUI_LIB_LOC"; then
! if test "$GUI_LIB_LOC" = /usr/lib \
-o "$GUI_LIB_LOC" = /usr/lib/i386-linux-gnu \
-o "$GUI_LIB_LOC" = /usr/lib/x86_64-linux-gnu; then
GUI_LIB_LOC=
--- 10228,10235 ----
done
done
if test -n "$GUI_LIB_LOC"; then
! if test "$GUI_LIB_LOC" = /usr/lib \
! -o "$GUI_LIB_LOC" = /usr/lib64 \
-o "$GUI_LIB_LOC" = /usr/lib/i386-linux-gnu \
-o "$GUI_LIB_LOC" = /usr/lib/x86_64-linux-gnu; then
GUI_LIB_LOC=
*** ../vim-9.0.1444/src/version.c 2023-04-12 16:21:11.037023796 +0100
--- src/version.c 2023-04-12 16:23:15.068698732 +0100
***************
*** 697,698 ****
--- 697,700 ----
{ /* Add new patch number below this line */
+ /**/
+ 1445,
/**/
--
TIM: Too late.
ARTHUR: What?
TIM: There he is!
[They all turn, and see a large white RABBIT lollop a few yards out of the
cave. Accompanied by terrifying chord and jarring metallic monster noise.]
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- b...@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 ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/20230412152430.7DE131C0F2A%40moolenaar.net.
