update from latest gnome foocanvas

foocanvas/zmap_source/configure.in

@@ -13,11 +13,11 @@ GNOME_COMMON_INIT
 AC_ISC_POSIX
 AC_PROG_CC
 AC_HEADER_STDC
-AM_PROG_LIBTOOL
 
-dnl Let's try not building dynamic libs.
-AC_DISABLE_SHARED
 
+dnl Disable shared libs so foocanvas is bound in to zmap.
+AC_DISABLE_SHARED
+AM_PROG_LIBTOOL
 
 GNOME_COMPILE_WARNINGS
 

foocanvas/zmap_source/configure.in.diff

---- ./tmp_merged_foocanvas/configure.in	2010-03-19 11:04:07.079000000 +0000
-+++ ./tmp_zmap_foocanvas/configure.in	2010-03-19 10:56:28.889000000 +0000
-@@ -13,13 +13,11 @@
+--- ./tmp_merged_foocanvas/configure.in	2010-03-24 09:32:27.946000000 +0000
++++ ./tmp_zmap_foocanvas/configure.in	2010-03-24 09:35:51.355000000 +0000
+@@ -3,7 +3,8 @@
+ 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
--
-+AM_PROG_LIBTOOL
- 
- dnl Let's try not building dynamic libs.
- AC_DISABLE_SHARED
- 
--AM_PROG_LIBTOOL
--
++
++
++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])
  
+ AC_CONFIG_FILES([
+ Makefile