aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-04 05:25:06 -04:00
Code Activity

patch 9.0.1445: openSUSE: configure doesn't find the Motif library

Browse Source 
Problem:    openSUSE: configure doesn't find the Motif library. (Tony
            Mechelynck)
Solution:   Also search in /usr/lib64.
This commit is contained in:
Bram Moolenaar
2023-04-12 16:24:03 +01:00
parent ac6cd31afc
commit 01967f5b10
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/auto/configure vendored
View File

@@ -10216,9 +10216,9 @@ $as_echo "no" >&6; }
GUI_LIB_LOC="`echo $GUI_LIB_LOC|sed 's%-L%%g'`" 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 "$as_me:${as_lineno-$LINENO}: checking for location of Motif GUI libs" >&5
$as_echo_n "checking for location of Motif GUI libs... " >&6; } $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_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= GUI_LIB_LOC=
for try in $gui_libs; do 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 for libtry in "$try"/libXm.a "$try"/libXm.dll.a "$try"/libXm.so* "$try"/libXm.sl "$try"/libXm.dylib; do
@@ -10228,7 +10228,8 @@ $as_echo_n "checking for location of Motif GUI libs... " >&6; }
done done
done done
if test -n "$GUI_LIB_LOC"; then if test -n "$GUI_LIB_LOC"; then
if test "$GUI_LIB_LOC" = /usr/lib \ 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/i386-linux-gnu \
-o "$GUI_LIB_LOC" = /usr/lib/x86_64-linux-gnu; then -o "$GUI_LIB_LOC" = /usr/lib/x86_64-linux-gnu; then
GUI_LIB_LOC= GUI_LIB_LOC=

7
src/configure.ac
View File

@@ -2976,8 +2976,9 @@ if test -z "$SKIP_MOTIF"; then
dnl Ubuntu has libXm.so in /usr/lib/i386-linux-gnu and elsewhere. The 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 linker will figure out which one to use, we only check if one exists.
dnl Cygwin uses the .dll.a extension. dnl Cygwin uses the .dll.a extension.
dnl OpenSUSE appears to use /usr/lib64.
AC_MSG_CHECKING(for location of Motif GUI libs) 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_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= GUI_LIB_LOC=
for try in $gui_libs; do 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 for libtry in "$try"/libXm.a "$try"/libXm.dll.a "$try"/libXm.so* "$try"/libXm.sl "$try"/libXm.dylib; do
@@ -2987,8 +2988,10 @@ if test -z "$SKIP_MOTIF"; then
done done
done done
if test -n "$GUI_LIB_LOC"; then if test -n "$GUI_LIB_LOC"; then
dnl Remove /usr/lib, it causes trouble on some systems 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 \ 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/i386-linux-gnu \
-o "$GUI_LIB_LOC" = /usr/lib/x86_64-linux-gnu; then -o "$GUI_LIB_LOC" = /usr/lib/x86_64-linux-gnu; then
GUI_LIB_LOC= GUI_LIB_LOC=

2
src/version.c
View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1445,
/**/ /**/
1444, 1444,
/**/ /**/