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

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index 06c0aab9b562970f85002fcd514df491b9abca79..d81daa51c3faf9195f16819eaa3c25d77498c261 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1331,6 +1331,9 @@ JIT_SUPPORTED=no
 INTERP_SUPPORTED=no
 LIBC="libc.so.6"
 INTL="libc.so.6"
+SQLITE="libsqlite.so.0"
+SQLITE3="libsqlite3.so.0"
+X11="libX11.so"
 
 jit_wanted=false
 interp_wanted=false
@@ -1491,6 +1494,9 @@ case "$host" in
        libsuffix=".dylib"
        LIBC="libc.dylib"
        INTL="libintl.dylib"
+       SQLITE="libsqlite.0.dylib"
+       SQLITE3="libsqlite3.0.dylib"
+       X11="libX11.dylib"
        ;;
      *-*-*netbsd*)
        LIBC="libc.so.12"
@@ -1505,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
@@ -1604,6 +1618,9 @@ AM_CONDITIONAL(INCLUDED_LIBGC, test x$gc = xincluded)
 
 AC_SUBST(LIBC)
 AC_SUBST(INTL)
+AC_SUBST(SQLITE)
+AC_SUBST(SQLITE3)
+AC_SUBST(X11)
 
 AC_SUBST(arch_target)
 AC_SUBST(CFLAGS)
@@ -1682,6 +1699,7 @@ mono/arch/s390/Makefile
 mono/arch/s390x/Makefile
 mono/arch/arm/Makefile
 mono/arch/alpha/Makefile
+mono/arch/ia64/Makefile
 mono/interpreter/Makefile
 mono/tests/Makefile
 mono/tests/tests-config