[libsigc++2] Update for latest mm-common 0.4

[Daniel Elstner <daniel src gnome org>]

commit e2864c6ca64b62b87f740a21ac0033f907bcf770
Author: Daniel Elstner <danielk openismus com>
Date:   Sun Aug 16 12:41:05 2009 +0200

    Update for latest mm-common 0.4
    
    * configure.ac (MM_PREREQ): Require mm-common 0.4.
    (MM_INIT_MODULE): Omit now optional version number argument.
    (MM_CONFIG_DOCTOOL_DIR): Copy the documentation utilities into docs/
    instead of scripts/.
    * Makefile.am (dist_noinst_DATA): Remove documentation utilities.
    * sigc++-2.0.pc.in (htmlrefpub): Append trailing slash.
    * sigc++-2.0-uninstalled.pc.in (htmlrefpub): ditto,
    * docs/Makefile.am (htmlrefpub): ditto.
    (doc_input): Perform a VPATH search for each input file, to correctly
    handle the case of rebuilding the documentation of a tarball release
    which includes the generated sources.
    (dist_noinst_DATA): List documentation utilities.

 .gitignore                   |   13 +++++++------
 Makefile.am                  |   10 ++--------
 configure.ac                 |    5 +++--
 docs/.gitignore              |    3 +++
 docs/Makefile.am             |   14 +++++++++++---
 scripts/.gitignore           |    3 ---
 sigc++-2.0-uninstalled.pc.in |    2 +-
 sigc++-2.0.pc.in             |    2 +-
 8 files changed, 28 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 521ae54..6bbe20a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,24 @@
-.deps
+.deps/
 .dirstamp
-.libs
+.libs/
 Makefile
 Makefile.in
-sigc-2.0.rc
-sigc++config.h
 *.[ao]
 *.l[ao]
 /INSTALL
+/MSVC_Net200[58]/sigc-2.0.rc
+/MSVC_Net200[58]/sigc++config.h
 /aclocal.m4
-/autom4te.cache
+/autom4te.cache/
 /config.h
 /config.h.in
 /config.log
 /config.status
+/config.status.lineno
 /configure
+/configure.lineno
 /libsigc++-*.tar.*
 /libtool
-/*.lineno
 /sigc++config.h
 /sigc++-*.pc
 /stamp-h?
diff --git a/Makefile.am b/Makefile.am
index 358ef6d..a9f6ae7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,13 +36,7 @@ dist_noinst_SCRIPTS = autogen.sh
 include $(srcdir)/MSVC_Net2005/filelist.am
 include $(srcdir)/MSVC_Net2008/filelist.am
 
-msvc_files = $(addprefix MSVC_Net2005/,$(msvc_net2005_data)) \
-	     $(addprefix MSVC_Net2008/,$(msvc_net2008_data))
-
-dist_noinst_DATA =			\
-	scripts/doc-install.pl		\
-	scripts/doc-postprocess.pl	\
-	scripts/tagfile-to-devhelp2.xsl	\
-	$(msvc_files)
+dist_noinst_DATA = $(addprefix MSVC_Net2005/,$(msvc_net2005_data)) \
+                   $(addprefix MSVC_Net2008/,$(msvc_net2008_data))
 
 DISTCLEANFILES = MSVC_Net2005/sigc++config.h MSVC_Net2008/sigc++config.h
diff --git a/configure.ac b/configure.ac
index d8b23ac..e2fbc7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,8 +29,9 @@ AM_INIT_AUTOMAKE([1.9 -Wno-portability no-define nostdinc tar-pax])
 AM_MAINTAINER_MODE
 AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
 
-MM_INIT_MODULE([sigc++-2.0], m4_expand([AC_PACKAGE_VERSION]))
-MM_CONFIG_DOCTOOL_DIR([scripts])
+MM_PREREQ([0.4])
+MM_INIT_MODULE([sigc++-2.0])
+MM_CONFIG_DOCTOOL_DIR([docs])
 
 AC_PROG_CXX
 AC_DISABLE_STATIC
diff --git a/docs/.gitignore b/docs/.gitignore
index 1262ba7..4fe7457 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,3 +1,6 @@
+/doc-install.pl
+/doc-postprocess.pl
+/tagfile-to-devhelp2.xsl
 /manual/html/
 /reference/html/
 /reference/Doxyfile
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 1b85129..fb448a3 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -19,10 +19,16 @@ include $(top_srcdir)/sigc++/filelist.am
 
 book_name  = libsigc++-$(SIGCXX_API_VERSION)
 pubdocbase = http://libsigc.sourceforge.net/
-htmlrefpub = $(pubdocbase)libsigc2/docs/reference/html
+htmlrefpub = $(pubdocbase)libsigc2/docs/reference/html/
 
-doc_input = $(addprefix $(top_srcdir)/sigc++/,$(sigc_public_h)) \
-	    $(addprefix $(top_builddir)/sigc++/,$(sigc_built_h))
+# For each header file, test whether it exists in the build directory.
+# If it does, return its relative path.  Otherwise, assume the file is
+# present in the source directory and return the relative path to that
+# location.
+libsigc_h = $(sigc_public_h) $(sigc_built_h)
+vp_select = $(or $(wildcard $(top_builddir)/sigc++/$(file)),$(top_srcdir)/sigc++/$(file))
+vp_search = $(foreach file,$(libsigc_h),$(vp_select))
+doc_input = $(if $(srcdir:.=),$(vp_search),$(addprefix $(top_builddir)/sigc++/,$(libsigc_h)))
 
 include $(top_srcdir)/scripts/doc-reference.am
 
@@ -30,4 +36,6 @@ doc_imagesdir = $(libdocdir)/images
 dist_libdoc_DATA = index.html
 dist_doc_images_DATA = images/libsigc_logo.gif images/top.gif
 
+dist_noinst_DATA += doc-install.pl doc-postprocess.pl tagfile-to-devhelp2.xsl
+
 include $(srcdir)/doc-manual.am
diff --git a/scripts/.gitignore b/scripts/.gitignore
index 66b85ec..8051982 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -3,8 +3,6 @@
 /config.sub
 /depcomp
 /dist-changelog.am
-/doc-install.pl
-/doc-postprocess.pl
 /doc-reference.am
 /generate-binding.am
 /install-sh
@@ -12,4 +10,3 @@
 /lt*.m4
 /ltmain.sh
 /missing
-/tagfile-to-devhelp2.xsl
diff --git a/sigc++-2.0-uninstalled.pc.in b/sigc++-2.0-uninstalled.pc.in
index 45488d8..f8d36f8 100644
--- a/sigc++-2.0-uninstalled.pc.in
+++ b/sigc++-2.0-uninstalled.pc.in
@@ -1,5 +1,5 @@
 doxytagfile=${pc_top_builddir}/docs/reference/libsigc++- SIGCXX_API_VERSION@.tag
-htmlrefpub=http://libsigc.sourceforge.net/libsigc2/docs/reference/html
+htmlrefpub=http://libsigc.sourceforge.net/libsigc2/docs/reference/html/
 
 Name: libsigc++
 Description: Typesafe signal and callback system for C++, not installed
diff --git a/sigc++-2.0.pc.in b/sigc++-2.0.pc.in
index 41d2b72..502981a 100644
--- a/sigc++-2.0.pc.in
+++ b/sigc++-2.0.pc.in
@@ -8,7 +8,7 @@ includedir= includedir@
 docdir=${datarootdir}/doc/libsigc++- SIGCXX_API_VERSION@
 doxytagfile=${docdir}/reference/libsigc++- SIGCXX_API_VERSION@.tag
 htmlrefdir=${docdir}/reference/html
-htmlrefpub=http://libsigc.sourceforge.net/libsigc2/docs/reference/html
+htmlrefpub=http://libsigc.sourceforge.net/libsigc2/docs/reference/html/
 
 Name: libsigc++
 Description: Typesafe signal and callback system for C++