diff -ur gtk+extra-2.1.2.orig/configure.in gtk+extra-2.1.2/configure.in
--- gtk+extra-2.1.2.orig/configure.in	2010-03-21 00:03:49.000000000 +0200
+++ gtk+extra-2.1.2/configure.in	2010-08-22 18:13:42.000000000 +0300
@@ -30,10 +30,10 @@
 AC_SUBST(GTK_EXTRA_VERSION)
 
 # libtool versioning
-LT_CURRENT=`expr $GTK_EXTRA_MICRO_VERSION - $GTK_EXTRA_INTERFACE_AGE`
-LT_REVISION=$GTK_EXTRA_INTERFACE_AGE
-LT_AGE=`expr $GTK_EXTRA_BINARY_AGE - $GTK_EXTRA_INTERFACE_AGE`
-LIBGTKEXTRA_SO_VERSION=$LT_CURRENT:$LT_REVISION:$LT_AGE
+LTCURRENT=`expr $GTK_EXTRA_MICRO_VERSION - $GTK_EXTRA_INTERFACE_AGE`
+LTREVISION=$GTK_EXTRA_INTERFACE_AGE
+LTAGE=`expr $GTK_EXTRA_BINARY_AGE - $GTK_EXTRA_INTERFACE_AGE`
+LIBGTKEXTRA_SO_VERSION=$LTCURRENT:$LTREVISION:$LTAGE
 AC_SUBST(LIBGTKEXTRA_SO_VERSION)
 
 # For automake
diff -ur gtk+extra-2.1.2.orig/gtkextra/Makefile.am gtk+extra-2.1.2/gtkextra/Makefile.am
--- gtk+extra-2.1.2.orig/gtkextra/Makefile.am	2005-06-16 01:54:34.000000000 +0300
+++ gtk+extra-2.1.2/gtkextra/Makefile.am	2010-08-22 18:21:54.000000000 +0300
@@ -54,7 +54,9 @@
 	-version-info $(LIBGTKEXTRA_SO_VERSION)    \
 	-export-dynamic                                         \
 	-rpath $(libdir)                                        \
-	$(no_undefined)                                         \
+	$(no_undefined)
+
+LDADD = \
 	$(GTK_LIBS)                                             
 
 #
@@ -63,97 +65,97 @@
 
 
 gtkextra_public_h_sources = \
-        gtkbordercombo.h 	\
-        gtkcharsel.h	\
-        gtkcheckitem.h	\
-        gtkcolorcombo.h	\
-        gtkcombobutton.h	\
-        gtkdirtree.h	\
-        gtkextra.h	\
-        gtkextrafeatures.h	\
-        gtkextraicons.h	\
-        gtkextra-marshal.h	\
-        gtkextratypebuiltins.h	\
-        gtkfilelist.h	\
-        gtkfileicons.h	\
-        gtkfontcombo.h	\
-        gtkiconfilesel.h	\
-        gtkiconlist.h	\
-        gtkitementry.h	\
-        gtkplot.h	\
-        gtkplotarray.h	\
-        gtkplot3d.h	\
-        gtkplotdt.h	\
-        gtkplotpolar.h	\
-        gtkplotdata.h	\
-        gtkplotpixmap.h	\
-        gtkplotbar.h	\
-        gtkplotbox.h	\
-        gtkplotbubble.h	\
-        gtkplotcandle.h	\
-        gtkplotflux.h	\
-        gtkplotsurface.h	\
-        gtkplotcsurface.h	\
-        gtkplotcanvas.h	\
-        gtkplotpc.h	\
-        gtkplotgdk.h	\
-        gtkplotps.h	\
-        gtkplotprint.h	\
-        gtkplotsegment.h	\
-        gtkpsfont.h	\
-        gtksheet.h	\
-        gtktogglecombo.h	\
-        gtkplotcanvasline.h \
-        gtkplotcanvasrectangle.h \
-        gtkplotcanvasellipse.h \
-        gtkplotcanvastext.h \
-        gtkplotcanvaspixmap.h \
-        gtkplotcanvasplot.h 
+	gtkbordercombo.h 	\
+	gtkcharsel.h	\
+	gtkcheckitem.h	\
+	gtkcolorcombo.h	\
+	gtkcombobutton.h	\
+	gtkdirtree.h	\
+	gtkextra.h	\
+	gtkextrafeatures.h	\
+	gtkextraicons.h	\
+	gtkextra-marshal.h	\
+	gtkextratypebuiltins.h	\
+	gtkfilelist.h	\
+	gtkfileicons.h	\
+	gtkfontcombo.h	\
+	gtkiconfilesel.h	\
+	gtkiconlist.h	\
+	gtkitementry.h	\
+	gtkplot.h	\
+	gtkplotarray.h	\
+	gtkplot3d.h	\
+	gtkplotdt.h	\
+	gtkplotpolar.h	\
+	gtkplotdata.h	\
+	gtkplotpixmap.h	\
+	gtkplotbar.h	\
+	gtkplotbox.h	\
+	gtkplotbubble.h	\
+	gtkplotcandle.h	\
+	gtkplotflux.h	\
+	gtkplotsurface.h	\
+	gtkplotcsurface.h	\
+	gtkplotcanvas.h	\
+	gtkplotpc.h	\
+	gtkplotgdk.h	\
+	gtkplotps.h	\
+	gtkplotprint.h	\
+	gtkplotsegment.h	\
+	gtkpsfont.h	\
+	gtksheet.h	\
+	gtktogglecombo.h	\
+	gtkplotcanvasline.h \
+	gtkplotcanvasrectangle.h \
+	gtkplotcanvasellipse.h \
+	gtkplotcanvastext.h \
+	gtkplotcanvaspixmap.h \
+	gtkplotcanvasplot.h 
 
 gtkextra_c_sources = 	\
-        gtkbordercombo.c	\
-        gtkcharsel.c	\
-        gtkcheckitem.c	\
-        gtkcolorcombo.c	\
-        gtkcombobutton.c	\
-        gtkdirtree.c	\
-        gtkextra.c	\
-        gtkextra-marshal.c	\
-        gtkextratypebuiltins.c	\
-        gtkfilelist.c	\
-        gtkfontcombo.c	\
-        gtkiconlist.c	\
-        gtkitementry.c	\
-        gtkiconfilesel.c	\
-        gtkplot.c	\
-        gtkplotarray.c	\
-        gtkplot3d.c	\
-        gtkplotdt.c	\
-        gtkplotpolar.c	\
-        gtkplotdata.c	\
-        gtkplotpixmap.c \
-        gtkplotbar.c	\
-        gtkplotbox.c	\
-        gtkplotbubble.c	\
-        gtkplotcandle.c	\
-        gtkplotflux.c	\
-        gtkplotsurface.c	\
-        gtkplotcsurface.c	\
-        gtkplotcanvas.c	\
-        gtkplotpc.c	\
-        gtkplotgdk.c	\
-        gtkplotps.c	\
-        gtkplotprint.c	\
-        gtkplotsegment.c	\
-        gtkpsfont.c	\
-        gtksheet.c	\
-        gtktogglecombo.c \
-        gtkplotcanvasline.c \
-        gtkplotcanvasrectangle.c \
-        gtkplotcanvasellipse.c \
-        gtkplotcanvastext.c \
-        gtkplotcanvaspixmap.c \
-        gtkplotcanvasplot.c 
+	gtkbordercombo.c	\
+	gtkcharsel.c	\
+	gtkcheckitem.c	\
+	gtkcolorcombo.c	\
+	gtkcombobutton.c	\
+	gtkdirtree.c	\
+	gtkextra.c	\
+	gtkextra-marshal.c	\
+	gtkextratypebuiltins.c	\
+	gtkfilelist.c	\
+	gtkfontcombo.c	\
+	gtkiconlist.c	\
+	gtkitementry.c	\
+	gtkiconfilesel.c	\
+	gtkplot.c	\
+	gtkplotarray.c	\
+	gtkplot3d.c	\
+	gtkplotdt.c	\
+	gtkplotpolar.c	\
+	gtkplotdata.c	\
+	gtkplotpixmap.c \
+	gtkplotbar.c	\
+	gtkplotbox.c	\
+	gtkplotbubble.c	\
+	gtkplotcandle.c	\
+	gtkplotflux.c	\
+	gtkplotsurface.c	\
+	gtkplotcsurface.c	\
+	gtkplotcanvas.c	\
+	gtkplotpc.c	\
+	gtkplotgdk.c	\
+	gtkplotps.c	\
+	gtkplotprint.c	\
+	gtkplotsegment.c	\
+	gtkpsfont.c	\
+	gtksheet.c	\
+	gtktogglecombo.c \
+	gtkplotcanvasline.c \
+	gtkplotcanvasrectangle.c \
+	gtkplotcanvasellipse.c \
+	gtkplotcanvastext.c \
+	gtkplotcanvaspixmap.c \
+	gtkplotcanvasplot.c 
 
 gtkextra_private_h_sources = \
 	icons.h \
@@ -197,13 +199,13 @@
 $(libgtkextra_x11_2_0_la_OBJECTS) $(libgtkextra_linux_fb_2_0_la_OBJECTS) $(libgtkextra_win32_2_0_la_OBJECTS): ${gtkextra_built_public_sources} ${gtkextra_built_private_headers}
 
 $(srcdir)/gtkextra-marshal.h: gtkextra-marshal.list
-        ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \
-        && mv gtkextra-marshal.tmp gtkextra-marshal.h ) \
-        || ( rm -f gtkextra-marshal.tmp && exit 1 )
+	( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \
+	&& mv gtkextra-marshal.tmp gtkextra-marshal.h ) \
+	|| ( rm -f gtkextra-marshal.tmp && exit 1 )
 $(srcdir)/gtkextra-marshal.c: gtkextra-marshal.h
-        ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \
-        && mv gtkextra-marshal.tmp gtkextra-marshal.c ) \
-        || ( rm -f gtkextra-marshal.tmp && exit 1 )
+	( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \
+	&& mv gtkextra-marshal.tmp gtkextra-marshal.c ) \
+	|| ( rm -f gtkextra-marshal.tmp && exit 1 )
 
 
 $(srcdir)/gtkextratypebuiltins.h: $(gtkextra_public_h_sources)