[librsvgmm] Use new MM_INIT_MODULE() Autoconf macro

[Daniel Elstner <daniel src gnome org>]

commit dc458d0c669809c7a57a599e84e4497eb3f15860
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Sun Jul 12 21:35:55 2009 +0200

    Use new MM_INIT_MODULE() Autoconf macro
    
    * configure.ac: Use MM_INIT_MODULE() to set up librsvgmm-2.0.
    (LIBRSVGMM_MODULES): Substitute list of module dependencies.
    * librsvg/librsvgmm-2.0.pc.in: Replace a number of hard-coded
    strings with @LIBRSVGMM_*@ substitutions.
    (datarootdir): Define variable.
    (docdir): Define variable.
    * librsvg/librsvgmm-2.0-uninstalled.pc.in: Replace a number of
    hard-coded strings with @LIBRSVGMM_*@ substitutions.
    (docdir): Define variable.
    * doc/Makefile.am (book_name): Set to $(LIBRSVGMM_MODULE_NAME).
    * doc/reference/Doxyfile.in (PROJECT_NUMBER): Set to
    @LIBRSVGMM_API_VERSION  

 configure.ac                            |   12 +++++-------
 doc/Makefile.am                         |    2 +-
 doc/reference/Doxyfile.in               |    2 +-
 librsvg/librsvgmm-2.0-uninstalled.pc.in |   11 +++++++----
 librsvg/librsvgmm-2.0.pc.in             |   11 +++++++----
 5 files changed, 21 insertions(+), 17 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7578de5..0fb708b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,22 +28,20 @@ AM_INIT_AUTOMAKE([1.10 -Wno-portability check-news no-define nostdinc tar-ustar]
 AM_MAINTAINER_MODE
 AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
 
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_CXX
+MM_INIT_MODULE([librsvgmm-2.0], m4_expand([AC_PACKAGE_VERSION]))
 
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 AC_SUBST([LIBRSVGMM_SO_VERSION], [0:0:0])
 
+AC_PROG_CXX
+
 LT_PREREQ([2.2.0])
 LT_INIT([disable-static win32-dll])
 
-PKG_CHECK_MODULES([LIBRSVGMM], [librsvg-2.0 >= 2.25 cairomm-1.0 >= 1.6 glibmm-2.4 >= 2.16])
+AC_SUBST([LIBRSVGMM_MODULES], ['librsvg-2.0 >= 2.25 cairomm-1.0 >= 1.6 glibmm-2.4 >= 2.16'])
+PKG_CHECK_MODULES([LIBRSVGMM], [$LIBRSVGMM_MODULES])
 
-# Get compiler flags to enable reentrancy
 MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
-
-# Locate gmmproc directory
 MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.4])
 
 MM_ARG_ENABLE_DOCUMENTATION
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3fec6c1..a04d72a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -18,7 +18,7 @@
 include $(top_srcdir)/librsvg/src/filelist.am
 include $(top_srcdir)/librsvg/librsvgmm/filelist.am
 
-book_name = librsvgmm-2.0
+book_name = $(LIBRSVGMM_MODULE_NAME)
 doc_input = $(addprefix $(top_srcdir)/librsvg/librsvgmm/,$(files_built_h))
 
 dist_noinst_DATA = reference/doxytag_to_devhelp2.xsl
diff --git a/doc/reference/Doxyfile.in b/doc/reference/Doxyfile.in
index 922ef36..3f9149b 100644
--- a/doc/reference/Doxyfile.in
+++ b/doc/reference/Doxyfile.in
@@ -6,7 +6,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = librsvgmm
-PROJECT_NUMBER         = 2.0
+PROJECT_NUMBER         = @LIBRSVGMM_API_VERSION@
 OUTPUT_DIRECTORY       = reference
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
diff --git a/librsvg/librsvgmm-2.0-uninstalled.pc.in b/librsvg/librsvgmm-2.0-uninstalled.pc.in
index f8f18af..a3e1cb1 100644
--- a/librsvg/librsvgmm-2.0-uninstalled.pc.in
+++ b/librsvg/librsvgmm-2.0-uninstalled.pc.in
@@ -1,6 +1,9 @@
+docdir=${pc_top_builddir}/doc
+
 Name: librsvgmm
 Description: C++ binding for librsvg, not installed
-Requires: librsvg-2.0 >= 2.25 cairomm-1.0 >= 1.6 glibmm-2.4 >= 2.16
-Version: @PACKAGE_VERSION@
-Libs:  ${pc_top_builddir}/${pcfiledir}/librsvgmm/librsvgmm-2.0.la
-Cflags: -I${pc_top_builddir}/${pcfiledir}
+Version: @LIBRSVGMM_VERSION@
+URL: http://www.gtkmm.org/
+Requires: @LIBRSVGMM_MODULES@
+Libs:  ${pc_top_builddir}/${pcfiledir}/librsvgmm/@LIBRSVGMM_MODULE_NAME  la
+Cflags: -I${pc_top_builddir}/${pcfiledir} -I${pc_top_builddir}/${pcfiledir}/@srcdir@
diff --git a/librsvg/librsvgmm-2.0.pc.in b/librsvg/librsvgmm-2.0.pc.in
index 5c92528..3888bcf 100644
--- a/librsvg/librsvgmm-2.0.pc.in
+++ b/librsvg/librsvgmm-2.0.pc.in
@@ -2,10 +2,13 @@ prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
+datarootdir= datarootdir@
+docdir=${datarootdir}/doc/@LIBRSVGMM_MODULE_NAME@
 
 Name: librsvgmm
 Description: C++ binding for librsvg
-Requires: librsvg-2.0 >= 2.25 cairomm-1.0 >= 1.6 glibmm-2.4 >= 2.16
-Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lrsvgmm-2.0
-Cflags: -I${includedir}/librsvgmm-2.0
+Version: @LIBRSVGMM_VERSION@
+URL: http://www.gtkmm.org/
+Requires: @LIBRSVGMM_MODULES@
+Libs: -L${libdir} -lrsvgmm- LIBRSVGMM_API_VERSION@
+Cflags: -I${includedir}/@LIBRSVGMM_MODULE_NAME@