Thu Jul 7 12:35:20 EDT 2005 Paolo Molaro <lupus@ximian.com>

	*supportw.c, Makefile.am: remove calls and link to libmono/libwapi.

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

diff --git a/support/ChangeLog b/support/ChangeLog
index 6d6ffe958ae1cf3a6d2fb99f88efbc25f9589427..cbe7c48fd02d404c375e220d5baf7dc056dc4894 100644 (file)
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,8 @@
+
+Thu Jul 7 12:35:20 EDT 2005 Paolo Molaro <lupus@ximian.com>
+
+       *supportw.c, Makefile.am: remove calls and link to libmono/libwapi.
+
 2005-07-01  Daniel Drake  <dsd@gentoo.org>
 
        * sys-xattr.c: Support FreeBSD's extattr implementation. Slight API rework

diff --git a/support/Makefile.am b/support/Makefile.am
index 388ed90a2e00f9fe9dc21512ae7ccf4229b42aff..20a43eab4260265d0e77f8be7e307c456b1f16d6 100644 (file)
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -80,8 +80,7 @@ libMonoSupportW_la_SOURCES =                  \
                supportw.h
 
 libMonoSupportW_la_LIBADD =                                    \
-               $(top_builddir)/mono/io-layer/libwapi.la        \
-               $(top_builddir)/mono/mini/libmono.la
+               $(GLIB_LIBS)
 
 # 
 # Use this target to refresh the values in map.[ch]

diff --git a/support/supportw.c b/support/supportw.c
index 434301d6359928b5eae2ee1e2d31c79568e15d9f..158fce068be1a60a773f894bcc2ec6e5f66ffb12 100644 (file)
--- a/support/supportw.c
+++ b/support/supportw.c
@@ -86,6 +86,8 @@ supportw_register_delegate (const char *function_name, void *fnptr)
 static gboolean
 register_assembly (const char *name, int *registered)
 {
+/* we can't use mono or wapi funcions in a support lib */
+#if 0
        MonoAssembly *assembly;
        MonoImageOpenStatus status;
        MonoImage *image;
@@ -127,6 +129,9 @@ register_assembly (const char *name, int *registered)
        *registered = 1;
        mono_assembly_close (assembly);
        return TRUE;
+#else
+       return FALSE;
+#endif
 }
 
 void