[librsvgmm] Require doc tools only in maintainer mode

[Daniel Elstner <daniel src gnome org>]

commit 95840598401d5fee55a230bb914b5b05c05e15a6
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Sun Jul 19 00:47:27 2009 +0200

    Require doc tools only in maintainer mode
    
    * build/mm-doc.m4 (_MM_ARG_ENABLE_DOCUMENTATION): Use AC_PATH_PROG()
    instead of AC_CHECK_PROG() to get the full path of each tool.  Change
    the tool requirements so that dot, Doxygen and xsltproc are mandatory
    only in maintainer mode.

 build/mm-doc.m4 |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 deletions(-)
---
diff --git a/build/mm-doc.m4 b/build/mm-doc.m4
index b97ccb2..5ac277b 100644
--- a/build/mm-doc.m4
+++ b/build/mm-doc.m4
@@ -15,23 +15,23 @@
 ## You should have received a copy of the GNU General Public License
 ## along with mm-autofu.  If not, see <http://www.gnu.org/licenses/>.
 
-#serial 20090711
+#serial 20090718
 
 ## _MM_ARG_ENABLE_DOCUMENTATION(variable)
 ##
 m4_define([_MM_ARG_ENABLE_DOCUMENTATION],
 [dnl
 AC_ARG_VAR([PERL], [path to Perl interpreter])
-AC_CHECK_PROG([PERL], [perl], [perl])[]dnl
+AC_PATH_PROG([PERL], [perl], [perl])[]dnl
 
 AC_ARG_VAR([DOT], [path to dot utility])
-AC_CHECK_PROG([DOT], [dot], [dot])[]dnl
+AC_PATH_PROG([DOT], [dot], [dot])[]dnl
 
 AC_ARG_VAR([DOXYGEN], [path to Doxygen utility])
-AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen])[]dnl
+AC_PATH_PROG([DOXYGEN], [doxygen], [doxygen])[]dnl
 
 AC_ARG_VAR([XSLTPROC], [path to xsltproc utility])
-AC_CHECK_PROG([XSLTPROC], [xsltproc], [xsltproc])[]dnl
+AC_PATH_PROG([XSLTPROC], [xsltproc], [xsltproc])[]dnl
 
 AC_ARG_ENABLE([documentation],
               [AS_HELP_STRING([--disable-documentation],
@@ -40,16 +40,17 @@ AC_ARG_ENABLE([documentation],
               [$1=yes])[]dnl
 
 AS_IF([test "x[$]$1" != xno],
-[dnl
-  AS_IF([test "x$PERL" = x],     [mm_missing=Perl],
-        [test "x$DOT" = x],      [mm_missing=dot],
-        [test "x$DOXYGEN" = x],  [mm_missing=Doxygen],
-        [test "x$XSLTPROC" = x], [mm_missing=xsltproc],
-        [mm_missing=])
-  AS_IF([test -n "$mm_missing"], [AC_MSG_FAILURE([[
-*** Documentation is enabled in this configuration, but the
-*** required tool $mm_missing could not be found.]])])[]dnl
-])
+  [AS_IF([test "x$PERL" = xperl], [AC_MSG_FAILURE([[
+*** Perl is required for installing the documentation.]])])
+
+  AS_IF([test "x$USE_MAINTAINER_MODE" != xno],
+  [  for mm_prog in "$DOT" "$DOXYGEN" "$XSLTPROC"
+    do
+      AS_CASE([$mm_prog], [dot|doxygen|xsltproc], [AC_MSG_FAILURE([[
+*** The documentation will be built in this configuration, but the
+*** required tool $mm_prog could not be found.]])])
+    done])[]dnl
+  ])
 AM_CONDITIONAL([$1], [test "x[$]$1" != xno])[]dnl
 ])
 
@@ -62,7 +63,12 @@ AM_CONDITIONAL([$1], [test "x[$]$1" != xno])[]dnl
 ##
 ## The tools checked for are Perl, dot, Doxygen and xsltproc.  The
 ## substitution variables PERL, DOT, DOXYGEN and XSLTPROC are set to
-## the command names, unless overridden in the user environment.
+## the command paths, unless overridden in the user environment.
+##
+## If the package provides the --enable-maintainer-mode option, the
+## tools dot, Doxygen and xsltproc are mandatory only when maintainer
+## mode is enabled.  Perl is required for the installdox utility even
+## if not in maintainer mode.
 ##
 AC_DEFUN([MM_ARG_ENABLE_DOCUMENTATION],
          [_MM_ARG_ENABLE_DOCUMENTATION(m4_default([$1], [ENABLE_DOCUMENTATION]))])