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:
-rw-r--r--ChangeLog8
-rw-r--r--configure.in9
-rw-r--r--data/config.in3
3 files changed, 20 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 35f0a19f96b..499b9ff4e71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-22 Ben Maurer <bmaurer@ximian.com>
+
+ * configure.in: Add config stuff for libsqlite{,3} and
+ libX11.
+
+ * data/config.in: Add dllmaps for above mentioned libs. This means
+ that the devel packages are not needed.
+
2005-05-17 Zoltan Varga <vargaz@freemail.hu>
* man/mono.1: Document the new MONO_DEBUG options.
diff --git a/configure.in b/configure.in
index f9eb2a2690c..8531d428198 100644
--- 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.6.2"
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"
@@ -1604,6 +1610,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)
diff --git a/data/config.in b/data/config.in
index 96c191e1a64..ffee333367b 100644
--- a/data/config.in
+++ b/data/config.in
@@ -9,4 +9,7 @@
<dllmap dll="db2cli" target="libdb2_36@libsuffix@"/>
<dllmap dll="msvcrt" target="@LIBC@"/>
<dllmap dll="MonoPosixHelper" target="libMonoPosixHelper@libsuffix@"/>
+ <dllmap dll="sqlite" target="@SQLITE@">
+ <dllmap dll="sqlite3" target="@SQLITE3@">
+ <dllmap dll="libX11" target="@X11@">
</configuration>