2005-05-25 Ben Maurer <bmaurer@ximian.com>

	* configure.in: Do a test for libX11.so that really works :-).

svn path=/trunk/mono/; revision=45010

diff --git a/ChangeLog b/ChangeLog
index 499b9ff4e717715aa14db00a3bd8016ca9fb9504..2fab0017f4df523f950fa88c02af32bd5ae27469 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-25  Ben Maurer  <bmaurer@ximian.com>
+
+       * configure.in: Do a test for libX11.so that really works :-).
+
 2005-05-22  Ben Maurer  <bmaurer@ximian.com>
 
        * configure.in: Add config stuff for libsqlite{,3} and

diff --git a/configure.in b/configure.in
index 8531d428198f1fd907093cc312863f8199e045ad..d81daa51c3faf9195f16819eaa3c25d77498c261 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1333,7 +1333,7 @@ LIBC="libc.so.6"
 INTL="libc.so.6"
 SQLITE="libsqlite.so.0"
 SQLITE3="libsqlite3.so.0"
-X11="libX11.so.6.2"
+X11="libX11.so"
 
 jit_wanted=false
 interp_wanted=false
@@ -1511,6 +1511,14 @@ case "$host" in
        INTL="libintl.so"
        ;;
 esac
+
+if test "x$X11" = "xlibX11.so"; then
+       AC_PATH_X
+       if test "x$no_x" != "xyes"; then
+               X11=`readlink $x_libraries/libX11.so`
+       fi
+fi
+
 AC_SUBST(libsuffix)
 
 if test "x$TARGET" != "xAMD64"; then