[cluttermm/cluttermm-1.2] Fix the build with the latest glibmm.

[Chris Kühl <chriskuehl src gnome org>]

commit f0eac7ab67a7e9e3be086d1cdc6fd685ec330a84
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             |    1 -
 codegen/m4/convert.m4 |    7 +++++++
 configure.ac          |    3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0c609db..38420d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -247,7 +247,6 @@
 
 	* 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>
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 17096e8..3c56010 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,9 +41,10 @@ AC_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
-AC_SUBST([CLUTTERMM_MODULES], ['clutter-1.0 >= 1.2.0 pangomm-1.4 >= 2.24'])
+AC_SUBST([CLUTTERMM_MODULES], ['clutter-1.0 >= 1.3.8 pangomm-1.4 >= 2.27.1 atkmm-1.6 >= 2.22.2'])
 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++])