[cluttermm] Fix the build with the latest glibmm.

[Murray Cumming <murrayc src gnome org>]

commit 2299d13f392e19f392922e980786c9e41fd0ab4a
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Jan 7 23:36:55 2011 +0100

    Fix the build with the latest glibmm.
    
    	* configure.ac: Get and use the path to the atkmm and pangomm m4 files.
    	* codegen/m4/convert.m4: Include the atkmm and pangomm m4 convert files.
    
    	This requires the latest atkmm and pangomm.

 ChangeLog             |    9 +++++++++
 codegen/m4/convert.m4 |    7 +++++++
 configure.ac          |    1 +
 3 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f56c493..375309b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-07  Murray Cumming  <murrayc murrayc com>
+
+	Fix the build with the latest glibmm.
+
+	* configure.ac: Get and use the path to the atkmm and pangomm m4 files.
+	* codegen/m4/convert.m4: Include the atkmm and pangomm m4 convert files.
+	
+	This requires the latest atkmm and pangomm.
+
 2010-11-02  Murray Cumming  <murrayc murrayc com>
 
 	Fix the build with clutter git master.
diff --git a/codegen/m4/convert.m4 b/codegen/m4/convert.m4
index 711e1ad..6da7a38 100644
--- a/codegen/m4/convert.m4
+++ b/codegen/m4/convert.m4
@@ -2,5 +2,12 @@ dnl Include gmmproc type conversion definitions:
 m4_include(`convert_base.m4')
 m4_include(`convert_glib.m4')
 m4_include(`convert_cairo.m4')
+
+# From pangomm. The path is discovered in configure.ac:
+m4_include(`convert_pango.m4')
+
+# From atkmm. The path is discovered in configure.ac:
+m4_include(`convert_atk.m4')
+
 m4_include(`convert_cogl.m4')
 m4_include(`convert_clutter.m4')
diff --git a/configure.ac b/configure.ac
index 2ffaadb..507cd6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,7 @@ AC_PROG_LIBTOOL
 AC_SUBST([CLUTTERMM_MODULES], ['clutter-1.0 >= 1.3.8 pangomm-1.4 >= 2.24 atkmm-1.6 >= 2.20'])
 PKG_CHECK_MODULES([CLUTTERMM], [$CLUTTERMM_MODULES])
 MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.4])
+MM_PKG_CONFIG_SUBST([GMMPROC_EXTRA_M4_DIR], [--variable=gmmprocm4dir pangomm-1.4 atkmm-1.6])
 
 MM_ARG_ENABLE_DOCUMENTATION
 MM_ARG_WITH_TAGFILE_DOC([libstdc++.tag], [mm-common-libstdc++])