2008-12-15 Miguel de Icaza <miguel@novell.com>

	* configure.in: Detect the proper LIB_PREFIX and LIB_SUFIX to fix
	the crasher for gsharp when trying to Plot on other systems.

svn path=/trunk/mono-tools/; revision=136051

ChangeLog

@@ -1,3 +1,8 @@
+2008-12-15  Miguel de Icaza  <miguel@novell.com>
+
+	* configure.in: Detect the proper LIB_PREFIX and LIB_SUFIX to fix
+	the crasher for gsharp when trying to Plot on other systems.
+
 2009-06-05  Michael Hutchinson  <mhutchinson@novell.com>
 
 	* configure.in: Fix build.

configure.in

@@ -118,6 +118,16 @@ if test -z "$CONFIG_REQUESTED" ; then
 	enable_debug=yes
 fi
 
+if test `uname -s` = "Darwin"; then
+        LIB_PREFIX=
+        LIB_SUFFIX=.dylib
+else
+        LIB_PREFIX=.so
+        LIB_SUFFIX=
+fi
+AC_SUBST(LIB_PREFIX)
+AC_SUBST(LIB_SUFFIX)
+
 dnl
 dnl I hate PKG_CONFIG_MODULES, that is for the weak
 dnl
@@ -159,6 +169,7 @@ AC_OUTPUT([
 Makefile
 gsharp/Makefile
 gsharp/gsharp
+gsharp/gsharp.exe.config
 gui-compare/Makefile
 gui-compare/gui-compare
 mperfmon/Makefile

gsharp/Makefile.am

@@ -1,7 +1,7 @@
 gsharpdir = $(prefix)/lib/gsharp
 bin_SCRIPTS = gsharp
 
-gsharp_DATA = gsharp.exe
+gsharp_DATA = gsharp.exe gsharp.exe.config
 
 desktopdir = $(datadir)/applications
 desktop_DATA = gsharp.desktop
@@ -26,7 +26,7 @@ gsharp_sources =                        			\
 	$(srcdir)/gtk-gui/Mono.CSharp.Gui.DescribeType.cs	\
 	$(srcdir)/outline.cs
 
-EXTRA_DIST = $(gsharp_sources) gsharp.in $(desktop_DATA).in close.png
+EXTRA_DIST = $(gsharp_sources) gsharp.in $(desktop_DATA).in close.png gsharp.exe.config.in
 CLEANFILES = $(gsharp_DATA) $(gsharp_DATA).mdb $(desktop_DATA)
 
 gsharp.exe: $(gsharp_sources)

gsharp/SysDrawing.cs

@@ -65,10 +65,10 @@ protected override bool OnExposeEvent (Gdk.EventExpose args)
 
 	public class GraphicsHelper {
 
-		[DllImport("libgdk-x11-2.0")]
+		[DllImport("libgdk-win32-2.0-0.dll")]
 		internal static extern IntPtr gdk_x11_drawable_get_xdisplay (IntPtr raw);
 
-		[DllImport("libgdk-x11-2.0")]
+		[DllImport("libgdk-win32-2.0-0.dll")]
 		internal static extern IntPtr gdk_x11_drawable_get_xid (IntPtr raw);
 
 		public static System.Drawing.Graphics FromDrawable (Gdk.Drawable drawable)

gsharp/gsharp.exe.config.in

@@ -0,0 +1,3 @@
+<configuration>
+  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+</configuration>