--- src/ipa/ipa/bmp.h.old	2001-10-23 13:24:12.000000000 +0200
+++ src/ipa/ipa/bmp.h	2011-05-22 23:39:09.000000000 +0200
@@ -66,7 +66,7 @@
 		return;
 	}
 
-	if (setjmp (png_ptr->jmpbuf))
+	if (setjmp (png_jmpbuf(png_ptr)))
 	{	WMF_DEBUG (API,"Failed to write bitmap as PNG! (setjmp failed)");
 		png_destroy_write_struct (&png_ptr,&info_ptr);
 		wmf_free (API,buffer);
--- src/Makefile.am.old	2004-02-10 13:41:26.000000000 +0100
+++ src/Makefile.am	2011-05-22 23:49:18.000000000 +0200
@@ -63,7 +63,7 @@
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	-release $(LT_RELEASE) -export-dynamic
 
-loaderdir = $(libdir)/$(GDK_PIXBUF_DIR)
+loaderdir = $(GDK_PIXBUF_DIR)
 
 loader_LTLIBRARIES = $(GDK_PIXBUF_PLUGIN)
 
@@ -72,6 +72,7 @@
 io_wmf_la_LIBADD = libwmf.la libwmflite.la @GDK_PIXBUF_LIBS@
 
 io_wmf_la_LDFLAGS = -no-undefined -module -avoid-version
+io_wmf_la_LIBTOOLFLAGS = --tag=disable-static
 
 PLAYERHEADERS = \
 	player/clip.h \
--- configure.ac.old	2005-07-27 22:48:39.000000000 +0200
+++ configure.ac	2011-05-22 23:38:00.000000000 +0200
@@ -744,8 +744,7 @@
 
 if test $LIBWMF_BUILDSTYLE != lite; then
 	PKG_CHECK_MODULES(GDK_PIXBUF,gdk-pixbuf-2.0 >= 2.1.2,[
-		GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
-		GDK_PIXBUF_DIR="gtk-2.0/$GTK_VERSION/loaders"
+		GDK_PIXBUF_DIR=`$PKG_CONFIG --variable=gdk_pixbuf_moduledir gdk-pixbuf-2.0`
 		wmf_gdk_pixbuf=yes
 	],[	wmf_gdk_pixbuf=no
 	])