Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Maurer <benm@mono-cvs.ximian.com>2005-06-15 20:04:05 +0400
committerBen Maurer <benm@mono-cvs.ximian.com>2005-06-15 20:04:05 +0400
commit50e21af3247970250b60090486f99e989e219e18 (patch)
treeedc9e84072ba898e4166e5dc62d7e5cf16130087 /configure.in
parentc3bec0b870dcf8d0f93a823a29a138a38e3d152d (diff)
* configure.in: Another attempt at the portable "find libX11.so"
Hopefully, this one has no code paths where we are worse off than what we had before any of this mess. svn path=/trunk/mono/; revision=46048
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in20
1 files changed, 10 insertions, 10 deletions
diff --git a/configure.in b/configure.in
index a06d7fc5ac7..18000430790 100644
--- a/configure.in
+++ b/configure.in
@@ -1539,17 +1539,17 @@ esac
if test "x$X11" = "xlibX11.so"; then
AC_PATH_X
- AC_PATH_PROG(OBJDUMP, objdump, no)
- if test "x$no_x" != "xyes"; then
- if test "x$OBJDUMP" != xno; then
- AC_MSG_CHECKING(for the soname of libX11.so)
- X11=$($OBJDUMP -p $x_libraries/libX11.so | $AWK '/SONAME/ {print $2}')
- AC_MSG_RESULT($X11)
- else
- AC_MSG_WARN([Could not find objdump. WinForms will not work if you install this mono on a box without the X -devel package.]);
- fi
+ AC_MSG_CHECKING(for the soname of libX11.so)
+ for i in $x_libraries /usr/lib /usr/lib64; do
+ for r in 4 5 6; do
+ if test -f $i/libX11.so.$r; then
+ X11=libX11.so.$r
+ AC_MSG_RESULT($X11)
+ fi
+ done
+ done
- else
+ if test "x$X11" = "xlibX11.so"; then
AC_MSG_WARN([Could not find X development libs. Do you have the -devel package installed? WinForms may not work...]);
fi
fi