2009-08-12 Christian Hoff <christian_hoff@gmx.net>

* configure.in.in: Detect GDK backend.
	* */*.dll.config.in: Link against the libs of the correct GDK backend
	instead of using x11 on Linux/win32 on Windows.
	Patch by Christian Hergert.	[Fixes 527840]

svn path=/trunk/gtk-sharp/; revision=139750
This commit is contained in:
Christian Hoff 2009-08-12 08:24:32 +00:00
parent 7db633218f
commit b244c750d3
5 changed files with 13 additions and 3 deletions

View File

@ -1,3 +1,10 @@
2009-08-12 Christian Hoff <christian_hoff@gmx.net>
* configure.in.in: Detect GDK backend.
* */*.dll.config.in: Link against the libs of the correct GDK backend
instead of using x11 on Linux/win32 on Windows.
Patch by Christian Hergert. [Fixes 527840]
2009-08-07 Mike Kestner <mkestner@novell.com>
* configure.in.in: add new dir and autofu for it.

View File

@ -202,6 +202,9 @@ if test "x$enable_glade_sharp" != "xno"; then
AC_SUBST(GLADE_LIBS)
fi
GDK_BACKEND=`pkg-config --variable=target gtk+-2.0`
AC_SUBST(GDK_BACKEND)
AC_PATH_PROG(MDOC, mdoc, no)
if test "x$MDOC" = "xno"; then
enable_monodoc=no

View File

@ -1,6 +1,6 @@
<configuration>
<dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-@GDK_BACKEND@-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</configuration>

View File

@ -2,5 +2,5 @@
<dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-@GDK_BACKEND@-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</configuration>

View File

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