updated for version 7.3.1216
Problem: Configure can't find Motif on Ubuntu.
Solution: Search for libXm in /usr/lib/*-linux-gnu.
diff --git a/src/auto/configure b/src/auto/configure
index ba9ae56..d1bde84 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -8346,9 +8346,9 @@
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; }
- 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=
for try in $gui_libs; do
for libtry in "$try"/libXm.a "$try"/libXm.so* "$try"/libXm.sl "$try"/libXm.dylib; do
@@ -8358,7 +8358,9 @@
done
done
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=
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: in default path" >&5
$as_echo "in default path" >&6; }
diff --git a/src/configure.in b/src/configure.in
index 37b6c14..d675930 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -2277,8 +2277,10 @@
dnl Remove "-L" from before $GUI_LIB_LOC if it's there
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)
- 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=
for try in $gui_libs; do
for libtry in "$try"/libXm.a "$try"/libXm.so* "$try"/libXm.sl "$try"/libXm.dylib; do
@@ -2289,7 +2291,9 @@
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; 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=
AC_MSG_RESULT(in default path)
else
diff --git a/src/version.c b/src/version.c
index a18bd78..e1c4ebc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1216,
+/**/
1215,
/**/
1214,