[gtkmm] Simplify and update for recent mm-common

[Daniel Elstner <daniel src gnome org>]

commit aa245b6327a9a02cf54ea55df9428543f63f7641
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Sun Aug 16 20:59:17 2009 +0200

    Simplify and update for recent mm-common
    
    * configure.ac: Insert MM_PREREQ([0.4]) macro call.
    (MM_INIT_MODULE): Omit now optional second argument.
    * atk/atkmm-1.6.pc.in, {gdk,gtk}/{gdk,gtk}mm-2.4.pc.in (htmlrefpub):
    Append trailing slash to URL, as per new mm-common recommendation.

 ChangeLog           |    9 +++++++++
 atk/atkmm-1.6.pc.in |    2 +-
 configure.ac        |    7 ++++---
 gdk/gdkmm-2.4.pc.in |    2 +-
 gtk/gtkmm-2.4.pc.in |    2 +-
 5 files changed, 16 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 786ec27..9cf6459 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2009-08-16  Daniel Elstner  <daniel kitta gmail com>
 
+	Simplify and update for recent mm-common
+
+	* configure.ac: Insert MM_PREREQ([0.4]) macro call.
+	(MM_INIT_MODULE): Omit now optional second argument.
+	* atk/atkmm-1.6.pc.in, {gdk,gtk}/{gdk,gtk}mm-2.4.pc.in (htmlrefpub):
+	Append trailing slash to URL, as per new mm-common recommendation.
+
+2009-08-16  Daniel Elstner  <daniel kitta gmail com>
+
 	Get rid of obsolete GLIBMM_USING_STD()
 
 	* gtk/gtkmm/treemodelcolumn.h: Stop using GLIBMM_USING_STD(), now
diff --git a/atk/atkmm-1.6.pc.in b/atk/atkmm-1.6.pc.in
index 17e1e18..465410f 100644
--- a/atk/atkmm-1.6.pc.in
+++ b/atk/atkmm-1.6.pc.in
@@ -8,7 +8,7 @@ includedir= includedir@
 docdir=${datarootdir}/doc/@GTKMM_MODULE_NAME@
 doxytagfile=${docdir}/reference/@GTKMM_MODULE_NAME  tag
 htmlrefdir=${docdir}/reference/html
-htmlrefpub=http://www.gtkmm.org/docs/@GTKMM_MODULE_NAME@/docs/reference/html
+htmlrefpub=http://www.gtkmm.org/docs/@GTKMM_MODULE_NAME@/docs/reference/html/
 
 Name: atkmm
 Description: C++ binding for the ATK accessibility toolkit
diff --git a/configure.ac b/configure.ac
index 116f3d5..8e554da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,9 +24,10 @@ AC_CONFIG_AUX_DIR([build])
 AC_CONFIG_MACRO_DIR([build])
 AC_CONFIG_HEADERS([config.h gdk/gdkmmconfig.h gtk/gtkmmconfig.h])
 
-MM_INIT_MODULE([atkmm-1.6], m4_expand([AC_PACKAGE_VERSION]))
-MM_INIT_MODULE([gdkmm-2.4], m4_expand([AC_PACKAGE_VERSION]))
-MM_INIT_MODULE([gtkmm-2.4], m4_expand([AC_PACKAGE_VERSION]))
+MM_PREREQ([0.4])
+MM_INIT_MODULE([atkmm-1.6])
+MM_INIT_MODULE([gdkmm-2.4])
+MM_INIT_MODULE([gtkmm-2.4])
 
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 AC_SUBST([LIBGTKMM_SO_VERSION], [1:30:0])
diff --git a/gdk/gdkmm-2.4.pc.in b/gdk/gdkmm-2.4.pc.in
index a2282c6..b73817e 100644
--- a/gdk/gdkmm-2.4.pc.in
+++ b/gdk/gdkmm-2.4.pc.in
@@ -8,7 +8,7 @@ includedir= includedir@
 docdir=${datarootdir}/doc/@GTKMM_MODULE_NAME@
 doxytagfile=${docdir}/reference/@GTKMM_MODULE_NAME  tag
 htmlrefdir=${docdir}/reference/html
-htmlrefpub=http://www.gtkmm.org/docs/@GTKMM_MODULE_NAME@/docs/reference/html
+htmlrefpub=http://www.gtkmm.org/docs/@GTKMM_MODULE_NAME@/docs/reference/html/
 
 Name: gdkmm
 Description: C++ binding for the GDK drawing kit
diff --git a/gtk/gtkmm-2.4.pc.in b/gtk/gtkmm-2.4.pc.in
index 8d70482..8f2130d 100644
--- a/gtk/gtkmm-2.4.pc.in
+++ b/gtk/gtkmm-2.4.pc.in
@@ -8,7 +8,7 @@ includedir= includedir@
 docdir=${datarootdir}/doc/@GTKMM_MODULE_NAME@
 doxytagfile=${docdir}/reference/@GTKMM_MODULE_NAME  tag
 htmlrefdir=${docdir}/reference/html
-htmlrefpub=http://www.gtkmm.org/docs/@GTKMM_MODULE_NAME@/docs/reference/html
+htmlrefpub=http://www.gtkmm.org/docs/@GTKMM_MODULE_NAME@/docs/reference/html/
 
 Name: gtkmm
 Description: C++ binding for the GTK+ toolkit