From e74a290091f0f0111441f28af46749e7655b7423 Mon Sep 17 00:00:00 2001
From: Christian Engwer <christi@dune-project.org>
Date: Wed, 3 May 2006 11:04:36 +0000
Subject: [PATCH] moved doc checks to DUNE_CHECK_ALL

[[Imported from SVN: r4531]]
---
 m4/dune_all.m4 | 80 +++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/m4/dune_all.m4 b/m4/dune_all.m4
index 0ee5c197d..ae67f6a8f 100644
--- a/m4/dune_all.m4
+++ b/m4/dune_all.m4
@@ -43,7 +43,46 @@ dnl check for library functions
   AC_CHECK_FUNCS([sqrt strchr])
   AC_LANG_POP([C++])
 
-dnl check all components
+  # check for auxiliary tools so that it's not fatal if they're missing
+  AC_CHECK_PROGS([DOXYGEN], [doxygen], [true])
+  AC_CHECK_PROGS([TEX], [latex], [true])
+  AC_CHECK_PROGS([BIBTEX], [bibtex], [true])
+  AC_CHECK_PROGS([DVIPDF], [dvipdf], [true])
+  AC_CHECK_PROGS([DVIPS], [dvips], [true])
+  AC_CHECK_PROGS([WML], [wml], [true])
+  AM_CONDITIONAL([WML], [test "x$WML" != xtrue])
+  AC_CHECK_PROGS([PERL], [perl], [true])
+  DUNE_INKSCAPE
+  AC_CHECK_PROGS([CONVERT], [convert], [true])
+
+  # doxygen and latex take a lot of time...
+  AC_ARG_ENABLE(documentation,
+   AC_HELP_STRING([--disable-documentation],[don't generate docs, speeds up the build]))
+  AM_CONDITIONAL(BUILD_DOCS, test x$enable_documentation != xno)
+
+  # special variable to include the documentation into the website
+  AC_ARG_WITH(duneweb,
+    AC_HELP_STRING([--with-duneweb=PATH],[Only needed for website-generation, path to checked out version of dune-web]))
+
+if test x$with_duneweb != x ; then
+   # parameter is set. Check it
+   AC_MSG_CHECKING([whether passed Dune-Web directory appears correct])
+   WEBTESTFILE="$with_duneweb/layout/default.wml"
+   if test -d "$with_duneweb" && test -e "$WEBTESTFILE" ; then
+      AC_MSG_RESULT([ok])
+      # normalize path
+      with_duneweb=`(cd $with_duneweb && pwd)` ;
+   else
+      if test -d "$with_duneweb" ; then
+        AC_MSG_ERROR([$WEBTESTFILE not found in Dune-web dir $with_duneweb!])
+      else
+        AC_MSG_ERROR([Dune-Web directory $with_duneweb not found!])
+      fi
+   fi
+fi
+AC_SUBST(DUNEWEBDIR, $with_duneweb)
+
+  dnl check all components
   AC_REQUIRE([DUNE_MODULE_DEPENDENCIES])
   DUNE_MODULE_DEPENDENCIES($@)
 #  AC_REQUIRE([DUNE_PATH_DUNE])
@@ -112,45 +151,6 @@ AC_DEFUN([DUNE_CHECK_ALL_M],[
   # don't build shared libs per default, this is way better for debugging...
   AC_REQUIRE([AC_DISABLE_SHARED])
 
-# check for auxiliary tools so that it's not fatal if they're missing
-AC_CHECK_PROGS([DOXYGEN], [doxygen], [true])
-AC_CHECK_PROGS([TEX], [latex], [true])
-AC_CHECK_PROGS([BIBTEX], [bibtex], [true])
-AC_CHECK_PROGS([DVIPDF], [dvipdf], [true])
-AC_CHECK_PROGS([DVIPS], [dvips], [true])
-AC_CHECK_PROGS([WML], [wml], [true])
-AM_CONDITIONAL([WML], [test "x$WML" != xtrue])
-AC_CHECK_PROGS([PERL], [perl], [true])
-DUNE_INKSCAPE
-AC_CHECK_PROGS([CONVERT], [convert], [true])
-
-# doxygen and latex take a lot of time...
-AC_ARG_ENABLE(documentation,
-   AC_HELP_STRING([--disable-documentation],[don't generate docs, speeds up the build]))
-AM_CONDITIONAL(BUILD_DOCS, test x$enable_documentation != xno)
-
-# special variable to include the documentation into the website
-AC_ARG_WITH(duneweb,
-    AC_HELP_STRING([--with-duneweb=PATH],[Only needed for website-generation, path to checked out version of dune-web]))
-
-if test x$with_duneweb != x ; then
-   # parameter is set. Check it
-   AC_MSG_CHECKING([whether passed Dune-Web directory appears correct])
-   WEBTESTFILE="$with_duneweb/layout/default.wml"
-   if test -d "$with_duneweb" && test -e "$WEBTESTFILE" ; then
-      AC_MSG_RESULT([ok])
-      # normalize path
-      with_duneweb=`(cd $with_duneweb && pwd)` ;
-   else
-      if test -d "$with_duneweb" ; then
-        AC_MSG_ERROR([$WEBTESTFILE not found in Dune-web dir $with_duneweb!])
-      else
-        AC_MSG_ERROR([Dune-Web directory $with_duneweb not found!])
-      fi
-   fi
-fi
-AC_SUBST(DUNEWEBDIR, $with_duneweb)
-
 # special settings for check-log
 AC_ARG_WITH(hostid,
   AC_HELP_STRING([--with-hostid=HOST_IDENTIFIER],
-- 
GitLab