diff options
author | Ben Maurer <benm@mono-cvs.ximian.com> | 2005-06-15 23:42:07 +0400 |
---|---|---|
committer | Ben Maurer <benm@mono-cvs.ximian.com> | 2005-06-15 23:42:07 +0400 |
commit | 38ba17f8fba52022c8be480c4d0b7790502fcf5d (patch) | |
tree | de89f018561c8e92bfbb533cc35bf179c5f1fd4d | |
parent | 467094bf19ed648481194cd7d436a62105423b93 (diff) |
backport config changemono-1.1.8
svn path=/tags/mono-1-1-8/mono/; revision=46068
-rw-r--r-- | configure.in | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/configure.in b/configure.in index 9c71c2a20ff..d2aa12a6a97 100644 --- a/configure.in +++ b/configure.in @@ -1535,24 +1535,23 @@ case "$host" in LIBC="libc.so" INTL="libintl.so" ;; -esac - -if test "x$X11" = "xlibX11.so"; then + *-*-*linux*) 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 + ;; +esac AC_SUBST(libsuffix) |