From c84896e4855c1befba5f5830d5a37251c011750f Mon Sep 17 00:00:00 2001
From: Christian Engwer <christi@dune-project.org>
Date: Tue, 12 Jun 2012 15:25:58 +0000
Subject: [PATCH] [m4] only warn about disabled duneweb if the user tried to
use duneweb
[[Imported from SVN: r6800]]
---
m4/dune_docu.m4 | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/m4/dune_docu.m4 b/m4/dune_docu.m4
index 9a964469d..71457b746 100644
--- a/m4/dune_docu.m4
+++ b/m4/dune_docu.m4
@@ -67,23 +67,24 @@ AC_DEFUN([DUNE_WEB],
AC_ARG_WITH(duneweb,
AS_HELP_STRING([--with-duneweb=PATH],[Only needed for website-generation, path to checked out version of dune-web]))
- # disable dune-web in official tarball mode
- AS_IF([test "x$enable_officialtarballs" = "xyes"],[
- AC_MSG_WARN([ignoring dune-web... official tarballs enabled])
- with_duneweb=""
- ])
+ AS_IF([test -n "$with_duneweb"],[
- # disable dune-web if wml or doxygen is missing
- AS_IF([test "x$WML" = "xtrue"],[
- AC_MSG_WARN([ignoring dune-web... wml missing])
- with_duneweb=""
- ])
- AS_IF([test "x$DOXYGEN" = "xtrue"],[
- AC_MSG_WARN([ignoring dune-web... doxygen missing])
- with_duneweb=""
- ])
+ # disable dune-web in official tarball mode
+ AS_IF([test "x$enable_officialtarballs" = "xyes"],[
+ AC_MSG_WARN([ignoring dune-web... official tarballs enabled])
+ with_duneweb="no"
+ ])
+
+ # disable dune-web if wml or doxygen is missing
+ AS_IF([test "x$WML" = "xtrue"],[
+ AC_MSG_WARN([ignoring dune-web... wml missing])
+ with_duneweb="no"
+ ])
+ AS_IF([test "x$DOXYGEN" = "xtrue"],[
+ AC_MSG_WARN([ignoring dune-web... doxygen missing])
+ with_duneweb="no"
+ ])
- AS_IF([test -n "$with_duneweb"],[
AS_IF([test "x$with_duneweb" != "xno"],[
# parameter is set. Check it
AC_MSG_CHECKING([whether passed Dune-Web ($with_duneweb) directory appears correct])
--
GitLab