diff -Naur libgnomecanvas-2.5.92-old/Makefile.in libgnomecanvas-2.5.92/Makefile.in
--- libgnomecanvas-2.5.92-old/Makefile.in	Mon Mar 15 16:49:31 2004
+++ libgnomecanvas-2.5.92/Makefile.in	Sat Mar 20 12:12:44 2004
@@ -122,7 +122,7 @@
 YACC = @YACC@
 gnomelocaledir = @gnomelocaledir@
 
-SUBDIRS = libgnomecanvas glade demos po tests docs
+SUBDIRS = libgnomecanvas glade demos po 
 
 EXTRA_DIST = COPYING.LIB ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff -Naur libgnomecanvas-2.5.92-old/demos/Makefile.in libgnomecanvas-2.5.92/demos/Makefile.in
--- libgnomecanvas-2.5.92-old/demos/Makefile.in	Mon Mar 15 16:49:35 2004
+++ libgnomecanvas-2.5.92/demos/Makefile.in	Sat Mar 20 12:17:07 2004
@@ -140,7 +140,7 @@
 
 LDADD = \
 	$(top_builddir)/libgnomecanvas/libgnomecanvas-2.la \
-	$(INTLLIBS)
+	$(LIBGNOMECANVAS_LIBS) $(INTLLIBS)
 
 
 noinst_PROGRAMS = canvas_demo
diff -Naur libgnomecanvas-2.5.92-old/ltmain.sh libgnomecanvas-2.5.92/ltmain.sh
--- libgnomecanvas-2.5.92-old/ltmain.sh	Fri Mar  5 00:22:34 2004
+++ libgnomecanvas-2.5.92/ltmain.sh	Sat Mar 20 12:12:44 2004
@@ -2264,7 +2264,7 @@
 	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
 	  if test "$installed" = no; then
 	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
+	    # need_relink=yes
 	  fi
 	  # This is a shared library
 	
@@ -3862,6 +3862,12 @@
 	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
 	    cmds=$archive_expsym_cmds
 	  else
+           if test "x$verstring" = "x0.0"; then
+              tmp_verstring=
+            else
+              tmp_verstring="$verstring"
+            fi
+
 	    cmds=$archive_cmds
 	    fi
 	  fi
