2007-01-27 Robert Jordan <robertj@gmx.net>

	* test/Makefile.am: Add linker option to be able to
	load symbols from the main program.
	* test/module.c: Clean-ups.

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

diff --git a/eglib/ChangeLog b/eglib/ChangeLog
index d4bb9928213e0f732c4efc16c10b7243f9cffb8a..786350347f7723b3ab0b9a03d11934789c1b5b12 100644 (file)
--- a/eglib/ChangeLog
+++ b/eglib/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-27  Robert Jordan  <robertj@gmx.net>
+
+       * test/Makefile.am: Add linker option to be able to
+       load symbols from the main program.
+       * test/module.c: Clean-ups.
+
 2007-01-26  Robert Jordan  <robertj@gmx.net>
 
        * configure.ac: Add PLATFORM_WIN32 conditional.

diff --git a/eglib/test/Makefile.am b/eglib/test/Makefile.am
index 6edd9f38e04cfbf213ded1b99136d44a34dd8b46..07c0c704a9194298b75d354c5bbe63408e7be2a8 100644 (file)
--- a/eglib/test/Makefile.am
+++ b/eglib/test/Makefile.am
@@ -32,9 +32,10 @@ test_glib_SOURCES = $(SOURCES)
 
 test_eglib_CFLAGS = -Wall -Werror -D_FORTIFY_SOURCE=2 -I$(srcdir)/../src -DDRIVER_NAME=\"EGlib\"
 test_eglib_LDADD = ../src/libeglib.la
+test_eglib_LDFLAGS = -Wl,--export-dynamic
 
 test_glib_CFLAGS = `pkg-config --cflags glib-2.0` -DDRIVER_NAME=\"GLib\"
-test_glib_LDFLAGS = `pkg-config --libs glib-2.0`
+test_glib_LDFLAGS = `pkg-config --libs glib-2.0 gmodule-2.0`
 
 MAINTAINERCLEANFILES = Makefile.in
 

diff --git a/eglib/test/module.c b/eglib/test/module.c
index 9f5db98e993c1bc6c2a72bfea7dff1b7662d46b3..02c743d3c9d7691ab748fe3cd0149b67239ff9df 100644 (file)
--- a/eglib/test/module.c
+++ b/eglib/test/module.c
@@ -7,15 +7,12 @@
 
 #if defined (G_OS_WIN32)
 #define EXTERNAL_SYMBOL "GetProcAddress"
-#define INTERNAL_SYMBOL "dummy_export"
 #else
 #define EXTERNAL_SYMBOL "system"
-/* FIXME: g_module_symbol () must prepend the "_"  */
-#define INTERNAL_SYMBOL "_dummy_export"
 #endif
 
 void G_MODULE_EXPORT
-dummy_export ()
+dummy_test_export ()
 {
 }
 
@@ -42,7 +39,7 @@ test_module_symbol_null ()
        if (!proc)
                return FAILED ("external lookup failed. #4");
 
-       if (!g_module_symbol (m, INTERNAL_SYMBOL, &proc))
+       if (!g_module_symbol (m, "dummy_test_export", &proc))
                return FAILED ("in-proc lookup failed. #5");
 
        if (!proc)