From d8fb1e1ff4023f69e525c809011b72e85447c072 Mon Sep 17 00:00:00 2001
From: Daniel Elstner <danielk@openismus.com>
Date: Fri, 28 Aug 2009 15:59:35 +0200
Subject: Do not fail hard if glibmm doctools are missing

* macros/mm-doc.m4 (_MM_CONFIG_DOCTOOL_DIR): Do not yet verify at this
point whether the directory returned by pkg-config is valid.
(_MM_ARG_ENABLE_DOCUMENTATION): Check the value of $MMDOCTOOLDIR here,
but do do not abort even if not set, unless --enable-documentation has
been explicitly requested.
---
 macros/mm-doc.m4 | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

(limited to 'macros')

diff --git a/macros/mm-doc.m4 b/macros/mm-doc.m4
index 10e6f82..70297d1 100644
--- a/macros/mm-doc.m4
+++ b/macros/mm-doc.m4
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with mm-common.  If not, see <http://www.gnu.org/licenses/>.
 
-#serial 20090822
+#serial 20090828
 
 ## _MM_CONFIG_DOCTOOL_DIR
 ##
@@ -39,13 +39,6 @@ are running a binary distribution and the glibmm package is installed,
 make sure that any separate development package for glibmm is installed
 as well.  If you built glibmm yourself, it may be necessary to adjust
 the PKG_CONFIG_PATH environment variable for pkg-config to find it.
-]])])
-  AS_IF([test "x$MMDOCTOOLDIR" = x],
-        [AC_MSG_ERROR([[not found
-The glibmm module is available, but the installation of glibmm on this
-machine is missing the shared documentation utilities of the GNOME C++
-bindings.  It may be necessary to upgrade to a more recent release of
-glibmm in order to build $PACKAGE_NAME.
 ]])])
 ])
 AC_MSG_RESULT([$MMDOCTOOLDIR])[]dnl
@@ -97,7 +90,12 @@ AC_ARG_ENABLE([documentation],
 AS_IF([test "x$ENABLE_DOCUMENTATION" != xno],
 [
   mm_err=
-  AS_IF([test "x$PERL" = xperl], [mm_err='Perl is required for installing the documentation.'],
+  AS_IF([test "x$MMDOCTOOLDIR" = x], [mm_err='dnl
+The glibmm module is available, but the installation of glibmm on this
+machine is missing the shared documentation utilities of the GNOME C++
+bindings.  It may be necessary to upgrade to a more recent release of
+glibmm in order to build '$PACKAGE_NAME' and install the documentation.'],
+        [test "x$PERL" = xperl], [mm_err='Perl is required for installing the documentation.'],
         [test "x$USE_MAINTAINER_MODE" != xno],
   [
     test "x$DOT" != xdot || mm_err=' dot'
@@ -115,18 +113,6 @@ AC_SUBST([DOXYGEN_TAGFILES], [[]])
 AC_SUBST([DOCINSTALL_FLAGS], [[]])[]dnl
 ])
 
-## _MM_TR_URI(shell-expression)
-##
-## Internal macro that expands to a reusable shell construct which
-## functions as a poor man's filesystem path to URI translator.
-## The input <shell-expression> is expanded within double quotes.
-##
-m4_define([_MM_TR_URI],
-[dnl
-[`expr "X$1" : 'X\(.*[^\\/]\)[\\/]*' 2>&]AS_MESSAGE_LOG_FD[ |]dnl
-[ sed 's|[\\]|/|g;s| |%20|g;s|^/|file:///|;s|^.:/|file:///&|' 2>&]AS_MESSAGE_LOG_FD[`]dnl
-])
-
 ## MM_ARG_ENABLE_DOCUMENTATION
 ##
 ## Provide the --disable-documentation configure option.  By default,
@@ -152,6 +138,18 @@ AC_REQUIRE([MM_PATH_PERL])[]dnl
 AC_REQUIRE([_MM_ARG_ENABLE_DOCUMENTATION])[]dnl
 ])
 
+## _MM_TR_URI(shell-expression)
+##
+## Internal macro that expands to a reusable shell construct which
+## functions as a poor man's filesystem path to URI translator.
+## The input <shell-expression> is expanded within double quotes.
+##
+m4_define([_MM_TR_URI],
+[dnl
+[`expr "X$1" : 'X\(.*[^\\/]\)[\\/]*' 2>&]AS_MESSAGE_LOG_FD[ |]dnl
+[ sed 's|[\\]|/|g;s| |%20|g;s|^/|file:///|;s|^.:/|file:///&|' 2>&]AS_MESSAGE_LOG_FD[`]dnl
+])
+
 ## _MM_ARG_WITH_TAGFILE_DOC(option-basename, pkg-variable, tagfilename, [module])
 ##
 m4_define([_MM_ARG_WITH_TAGFILE_DOC],
-- 
cgit v1.2.1