[gtkmm] Use the m4 convert files from atkmm and pangomm instead of repeating them.

[Murray Cumming <murrayc src gnome org>]

commit 513b8e8f61b71a78aa72f606a19f8bd71c2726bb
Author: Murray Cumming <murrayc murrayc com>
Date:   Sat Jan 8 00:15:56 2011 +0100

    Use the m4 convert files from atkmm and pangomm instead of repeating them.
    
    * configure.ac: Discover the path of the pangomm and atkmm m4 files for use
    instead of repeating them here.
    * tools/m4: Remove convert_pango.m4 and convert_atk.m4.

 ChangeLog                                |    8 ++
 configure.ac                             |    3 +-
 demos/gtk-demo/example_change_display.cc |    2 +
 tools/m4/convert_atk.m4                  |   62 ----------
 tools/m4/convert_gtkmm.m4                |    7 +-
 tools/m4/convert_pango.m4                |  184 ------------------------------
 tools/m4/filelist.am                     |    4 +-
 7 files changed, 19 insertions(+), 251 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c523842..af0e622 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-01-07  Murray Cumming  <murrayc murrayc com>
 
+	Use the m4 convert files from atkmm and pangomm instead of repeating them.
+
+	* configure.ac: Discover the path of the pangomm and atkmm m4 files for use 
+	instead of repeating them here.
+	* tools/m4: Remove convert_pango.m4 and convert_atk.m4.
+
+2011-01-07  Murray Cumming  <murrayc murrayc com>
+
 	Gdk::Cursor: Avoid warnings and failures about reusing existing C instances. 
 
 	* gdk/src/cursor.[hg|ccg]: Remove the constructors, because the 
diff --git a/configure.ac b/configure.ac
index 5bbf7de..9615db4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,6 +75,7 @@ PKG_CHECK_MODULES([GTKMM], [$GTKMM_MODULES])
 MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
 MM_PKG_CONFIG_SUBST([GTHREAD_LIBS], [--libs gthread-2.0])
 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])
 
 GTKMM_ARG_ENABLE_API_MAEMO_EXTENSIONS
 MM_ARG_DISABLE_DEPRECATED_API([GDKMM GTKMM])
@@ -94,7 +95,7 @@ AC_CHECK_FUNCS([flockfile funlockfile getc_unlocked mkfifo])
 MM_ARG_ENABLE_WARNINGS([GTKMM_WXXFLAGS],
                        [-Wall],
                        [-pedantic -Wall -Wextra  -Wno-long-long -DGSEAL_ENABLE],
-                       [G PANGO ATK GDK GDK_PIXBUF GTK ATKMM PANGOMM CAIROMM])
+                       [G PANGO ATK GDK GDK_PIXBUF GTK GLIBMM ATKMM PANGOMM CAIROMM])
 
 AC_CONFIG_FILES([Makefile
                  tools/Makefile
diff --git a/demos/gtk-demo/example_change_display.cc b/demos/gtk-demo/example_change_display.cc
index 3b3eb87..5279f1b 100644
--- a/demos/gtk-demo/example_change_display.cc
+++ b/demos/gtk-demo/example_change_display.cc
@@ -417,6 +417,8 @@ Gtk::Window* Example_ChangeDisplay::query_for_toplevel(const Glib::RefPtr<Gdk::S
 // Finds the toplevel window under the mouse pointer, if any.
 Gtk::Widget* Example_ChangeDisplay::find_toplevel_at_pointer(const Glib::RefPtr<Gdk::Display>& display)
 {
+  //TODO: This needs to use Device::get_window_at_position(), when we can figure that out.
+  //See https://bugzilla.gnome.org/show_bug.cgi?id=638907
   Glib::RefPtr<Gdk::Window> refPointerWindow = display->get_window_at_pointer();
 
   if (refPointerWindow)
diff --git a/tools/m4/convert_gtkmm.m4 b/tools/m4/convert_gtkmm.m4
index a0a97db..d555489 100644
--- a/tools/m4/convert_gtkmm.m4
+++ b/tools/m4/convert_gtkmm.m4
@@ -19,7 +19,12 @@
 include(class_gtkobject.m4)
 include(convert_base.m4)
 include(convert_gtk.m4)
-include(convert_pango.m4)
 include(convert_gdk.m4)
+
+# From atkmm: The path to this is obtained in configure.ac:
 include(convert_atk.m4)
+
+# From pangomm: The path to this is obtained in configure.ac:
+include(convert_pango.m4)
+
 include(convert_glib.m4)
diff --git a/tools/m4/filelist.am b/tools/m4/filelist.am
index 84963d5..38c37fb 100644
--- a/tools/m4/filelist.am
+++ b/tools/m4/filelist.am
@@ -19,8 +19,6 @@
 files_codegen_m4 =		\
 	class_gtkobject.m4		\
 	convert.m4		\
-	convert_atk.m4		\
 	convert_gdk.m4		\
 	convert_gtk.m4		\
-	convert_gtkmm.m4	\
-	convert_pango.m4
+	convert_gtkmm.m4