From 79f5b1b3bcdefb4b2a63f29d979471f1cb1676a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Sat, 3 Sep 2016 17:33:40 +0000 Subject: [PATCH] hack to fix uml image --- ax_init_standard_project.m4 | 2 -- bootstrap.sh | 2 +- doc/doxyfile.in | 2 +- nodejs/doc/documentation.dox | 3 +++ 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index 5973fcf..cbfeb7c 100644 --- a/ax_init_standard_project.m4 +++ b/ax_init_standard_project.m4 @@ -555,8 +555,6 @@ AC_DEFUN([AX_USE_DOXYGEN], [ if test -f "${srcdir}/doc/plantuml.jar"; then PLANTUML="doc/plantuml.jar" AX_SUBST(PLANTUML) - else - AC_MSG_ERROR([NOT FOUND ac_top_srcdir=${ac_top_srcdir} top_srcdir=${top_srcdir} srcdir=${srcdir}]) fi AM_CONDITIONAL(HAVE_PLANTUML, test -n "$PLANTUML") PDF_DOC=${PACKAGE_NAME}-${PACKAGE_VERSION}.pdf diff --git a/bootstrap.sh b/bootstrap.sh index 9afd474..2b268a6 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1008,7 +1008,7 @@ if testtag AX_USE_DOXYGEN; then doxyadd ALIASES '"readme=@README_HTML@"' doxyadd ALIASES '"author=@AUTHOR_NAME@"' if testtag AX_USE_PLANTUML; then - doxyadd ALIASES '"startuml{1}=\\image html \\1\\n\\image latex \\1\\n\\if DontIgnorePlantUMLCode"' + doxyadd ALIASES '"startuml{1}=@image html \\1\\n@image latex \\1\\n\\if DontIgnorePlantUMLCode"' doxyadd ALIASES '"enduml=\\endif"' doxyadd IMAGE_PATH '"gen-uml-images"' fi diff --git a/doc/doxyfile.in b/doc/doxyfile.in index 6d2b6c9..599373d 100644 --- a/doc/doxyfile.in +++ b/doc/doxyfile.in @@ -230,7 +230,7 @@ TAB_SIZE = 2 ALIASES = "id=\par File-ID\n" ALIASES += "enduml=\endif" -ALIASES += "startuml{1}=\image html \1\n\image latex \1\n\if DontIgnorePlantUMLCode" +ALIASES += "startuml{1}=@image html \1\n@image latex \1\n\if DontIgnorePlantUMLCode" ALIASES += "author=@AUTHOR_NAME@" ALIASES += "readme=@README_HTML@" ALIASES += "description=@DESCRIPTION@" diff --git a/nodejs/doc/documentation.dox b/nodejs/doc/documentation.dox index f52fe80..af1c4d3 100644 --- a/nodejs/doc/documentation.dox +++ b/nodejs/doc/documentation.dox @@ -97,6 +97,9 @@ @section overview System Overview + @image html overview.png + @image latex overview.png + @startuml{overview.png} interface "user" interface "user" as otheruser