update from latest gnome foocanvas

foocanvas/zmap_source/configure.in

@@ -64,7 +64,7 @@ dnl GTK_DOC_CHECK([1.0])
 AC_CONFIG_FILES([
 Makefile
 libfoocanvas/Makefile
-libfoocanvas/libfoocanvas.pc
+libfoocanvas/libzmapfoocanvas.pc
 demos/Makefile
 ])
 AC_OUTPUT

foocanvas/zmap_source/configure.in.diff

---- ./tmp_merged_foocanvas/configure.in	2010-03-24 14:47:04.503000000 +0000
-+++ ./tmp_zmap_foocanvas/configure.in	2010-03-24 14:47:01.317000000 +0000
-@@ -1,9 +1,10 @@
- AC_PREREQ(2.50)
--AC_INIT([libfoocanvas], [0.1])
-+AC_INIT([libzmapfoocanvas], [0.1])
- AC_CONFIG_SRCDIR([libfoocanvas/foo-canvas.c])
- 
- AC_CONFIG_HEADERS([config.h])
--AM_INIT_AUTOMAKE([dist-bzip2])
-+dnl [dist-bz2] removed from the AM_INIT_AUTOMAKE()
-+AM_INIT_AUTOMAKE([])
- 
- AM_MAINTAINER_MODE
- 
-@@ -12,6 +13,10 @@
- AC_ISC_POSIX
- AC_PROG_CC
- AC_HEADER_STDC
-+
-+
-+dnl Disable shared libs so foocanvas is bound in to zmap.
-+AC_DISABLE_SHARED
- AM_PROG_LIBTOOL
- 
- GNOME_COMPILE_WARNINGS
-@@ -53,7 +58,8 @@
-   AC_SUBST(HTML_DIR, $with_html_dir)
- fi
- 
--GTK_DOC_CHECK([1.0])
-+dnl MAC OS X doesn't like this... (requires gtk-doc, which requires a million other packages)
-+dnl GTK_DOC_CHECK([1.0])
- 
+--- ./tmp_merged_foocanvas/configure.in	2010-03-30 08:31:39.284000000 +0000
++++ ./tmp_zmap_foocanvas/configure.in	2010-03-30 08:49:27.078000000 +0000
+@@ -64,7 +64,7 @@
  AC_CONFIG_FILES([
  Makefile
+ libfoocanvas/Makefile
+-libfoocanvas/libfoocanvas.pc
++libfoocanvas/libzmapfoocanvas.pc
+ demos/Makefile
+ ])
+ AC_OUTPUT

foocanvas/zmap_source/libfoocanvas/Makefile.am

@@ -70,7 +70,7 @@ non-intermediate: foo-canvas-marshal.c
 
 CLEANFILES = foo-canvas-marshal.h foo-canvas-marshal.c
 
-EXTRA_DIST = libfoocanvas.pc.in
+EXTRA_DIST = libzmapfoocanvas.pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libfoocanvas.pc
+pkgconfig_DATA = libzmapfoocanvas.pc

foocanvas/zmap_source/libfoocanvas/Makefile.am.diff

---- ./tmp_merged_foocanvas/libfoocanvas/Makefile.am	2010-03-24 14:47:04.378000000 +0000
-+++ ./tmp_zmap_foocanvas/libfoocanvas/Makefile.am	2010-03-24 14:47:01.337000000 +0000
-@@ -12,34 +12,40 @@
- 	-DG_LOG_DOMAIN=\"Foocanvas\"			\
- 	-DVERSION=\"$(VERSION)\"
+--- ./tmp_merged_foocanvas/libfoocanvas/Makefile.am	2010-03-30 08:31:39.292000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/Makefile.am	2010-03-30 08:48:51.917000000 +0000
+@@ -70,7 +70,7 @@
  
--lib_LTLIBRARIES = libfoocanvas.la
-+lib_LTLIBRARIES = libzmapfoocanvas.la
+ CLEANFILES = foo-canvas-marshal.h foo-canvas-marshal.c
  
--libfoocanvas_la_LIBADD = \
-+libzmapfoocanvas_la_LIBADD = \
- 	$(RENDER_LIBS)				\
- 	$(LIBFOOCANVAS_LIBS)
+-EXTRA_DIST = libfoocanvas.pc.in
++EXTRA_DIST = libzmapfoocanvas.pc.in
  
--libfoocanvasincludedir = $(includedir)/libfoocanvas-1.0/libfoocanvas
-+libfoocanvasincludedir = $(includedir)/libzmapfoocanvas-1.0/libfoocanvas
- 
- libfoocanvasinclude_HEADERS =			\
- 	foo-canvas-line.h			\
-+	foozmap-canvas-line-glyph.h		\
- 	foo-canvas-pixbuf.h			\
- 	foo-canvas-polygon.h			\
- 	foo-canvas-rect-ellipse.h		\
- 	foo-canvas-text.h			\
-+	foozmap-canvas-text.h			\
-+	foozmap-canvas-floating-group.h		\
- 	foo-canvas-util.h			\
- 	foo-canvas-widget.h			\
- 	foo-canvas.h				\
- 	libfoocanvas.h
- 
--libfoocanvas_la_SOURCES =			\
-+libzmapfoocanvas_la_SOURCES =			\
- 	$(libfoocanvasinclude_HEADERS)		\
- 	foo-canvas-marshal.list			\
- 	foo-canvas-i18n.h			\
- 	foo-canvas-line.c			\
-+	foozmap-canvas-line-glyph.c		\
- 	foo-canvas-pixbuf.c			\
- 	foo-canvas-polygon.c			\
- 	foo-canvas-rect-ellipse.c		\
- 	foo-canvas-text.c			\
-+	foozmap-canvas-text.c			\
-+	foozmap-canvas-floating-group.c		\
- 	foo-canvas-util.c			\
- 	foo-canvas-widget.c			\
- 	foo-canvas.c				\
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libzmapfoocanvas.pc