[cairo-commit] goocanvas ChangeLog,1.54,1.55 configure.in,1.8,1.9

[Damon Chaplin]

Committed by: damon

Update of /cvs/cairo/goocanvas
In directory kemper:/tmp/cvs-serv28764

Modified Files:
	ChangeLog configure.in 
Log Message:
2006-10-12  Damon Chaplin  <damon at gnome.org>

	Applied patch from Paul Davis to use glib_mkenums, slightly modified:

	* configure.in: use pkg-config to get the glib_genmarshal and
	glib_mkenums binaries.

	* src/Makefile.am: use glib_mkenums to generate goocanvasenums.[hc].

	* src/goocanvasutils.c: removed goo_canvas_pointer_events_get_type()
	and goo_canvas_item_visibility_get_type() as they're generated now.

	* src/goocanvasutils.h: removed get_type() declarations that are now
	in goocanvasenums.h, and modifed GooCanvasPointerEvents so glib_mkenums
	could parse it.

	* src/goocanvas.h: 
	* src/goocanvasitem.c: include goocanvasenums.h.



Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/goocanvas/ChangeLog,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- ChangeLog	12 Oct 2006 10:33:26 -0000	1.54
+++ ChangeLog	12 Oct 2006 12:53:47 -0000	1.55
@@ -1,5 +1,24 @@
 2006-10-12  Damon Chaplin  <damon at gnome.org>
 
+	Applied patch from Paul Davis to use glib_mkenums, slightly modified:
+
+	* configure.in: use pkg-config to get the glib_genmarshal and
+	glib_mkenums binaries.
+
+	* src/Makefile.am: use glib_mkenums to generate goocanvasenums.[hc].
+
+	* src/goocanvasutils.c: removed goo_canvas_pointer_events_get_type()
+	and goo_canvas_item_visibility_get_type() as they're generated now.
+
+	* src/goocanvasutils.h: removed get_type() declarations that are now
+	in goocanvasenums.h, and modifed GooCanvasPointerEvents so glib_mkenums
+	could parse it.
+
+	* src/goocanvas.h: 
+	* src/goocanvasitem.c: include goocanvasenums.h.
+
+2006-10-12  Damon Chaplin  <damon at gnome.org>
+
 	* src/goocanvaspolyline.h (struct _GooCanvasPoints): use a separate
 	typedef declaration for the struct, to help C++ bindings. From Paul
 	Davis.

Index: configure.in
===================================================================
RCS file: /cvs/cairo/goocanvas/configure.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- configure.in	11 Sep 2006 11:09:14 -0000	1.8
+++ configure.in	12 Oct 2006 12:53:47 -0000	1.9
@@ -26,8 +26,11 @@
 ALL_LINGUAS="en_GB"
 AM_GLIB_GNU_GETTEXT
 
-AC_ARG_VAR(GLIB_GENMARSHAL, [The glib-genmarshal executable.])
-AC_CHECK_PROG(GLIB_GENMARSHAL, glib-genmarshal, glib-genmarshal)
+GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+AC_SUBST(GLIB_GENMARSHAL)
+
+GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+AC_SUBST(GLIB_MKENUMS)
 
 GTK_DOC_CHECK(1.4)