thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.1216

Browse Source 
Problem:    Configure can't find Motif on Ubuntu.
Solution:   Search for libXm in /usr/lib/*-linux-gnu.
This commit is contained in:
Bram Moolenaar
2013-06-17 20:27:18 +02:00
parent 06ae70d07c
commit 6324c3b920
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/auto/configure vendored
View File

@@ -8348,7 +8348,7 @@ $as_echo "no" >&6; }
{ $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` `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/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.so* "$try"/libXm.sl "$try"/libXm.dylib; do for libtry in "$try"/libXm.a "$try"/libXm.so* "$try"/libXm.sl "$try"/libXm.dylib; do
@@ -8358,7 +8358,9 @@ $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; 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= GUI_LIB_LOC=
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: in default path" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: in default path" >&5
$as_echo "in default path" >&6; } $as_echo "in default path" >&6; }

8
src/configure.in
View File

@@ -2277,8 +2277,10 @@ if test -z "$SKIP_MOTIF"; then
dnl Remove "-L" from before $GUI_LIB_LOC if it's there dnl Remove "-L" from before $GUI_LIB_LOC if it's there
GUI_LIB_LOC="`echo $GUI_LIB_LOC|sed 's%-L%%g'`" GUI_LIB_LOC="`echo $GUI_LIB_LOC|sed 's%-L%%g'`"
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) AC_MSG_CHECKING(for location of Motif GUI libs)
gui_libs="`echo $x_libraries|sed 's%/[^/][^/]*$%%'` `echo "$gui_XXX" | sed s/XXX/lib/g` `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/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.so* "$try"/libXm.sl "$try"/libXm.dylib; do for libtry in "$try"/libXm.a "$try"/libXm.so* "$try"/libXm.sl "$try"/libXm.dylib; do
@@ -2289,7 +2291,9 @@ if test -z "$SKIP_MOTIF"; then
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
if test "$GUI_LIB_LOC" = /usr/lib; 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= GUI_LIB_LOC=
AC_MSG_RESULT(in default path) AC_MSG_RESULT(in default path)
else else

2
src/version.c
View File

@@ -728,6 +728,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 */
/**/
1216,
/**/ /**/
1215, 1215,
/**/ /**/