From 52ac506186d939358721929ce6b2776fc55dd68a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 8 Sep 2016 08:35:53 +0000
Subject: [PATCH] plantuml now also works for old doxygen versions

---
 COPYING                      | 2 +-
 INSTALL                      | 2 +-
 ax_init_standard_project.m4  | 6 +++++-
 bootstrap.sh                 | 9 +--------
 nodejs/doc/documentation.dox | 2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/COPYING b/COPYING
index 88798ab..caeca07 120000
--- a/COPYING
+++ b/COPYING
@@ -1 +1 @@
-/usr/share/automake-1.15/COPYING
\ No newline at end of file
+/usr/share/automake-1.14/COPYING
\ No newline at end of file
diff --git a/INSTALL b/INSTALL
index ddcdb76..f812f5a 120000
--- a/INSTALL
+++ b/INSTALL
@@ -1 +1 @@
-/usr/share/automake-1.15/INSTALL
\ No newline at end of file
+/usr/share/automake-1.14/INSTALL
\ No newline at end of file
diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index c146faa..b9fad76 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -573,7 +573,11 @@ AC_DEFUN([AX_USE_DOXYGEN], [
   AX_ADD_MAKEFILE_TARGET_DEP([.PHONY], [pdf gen-uml-images], [doc/makefile.in])
   test -f doc/makefile.in && cat >> doc/makefile.in <<EOF
 #### Begin: Appended by $0
-doc: doxyfile @NEED_PLANTUML_TRUE@ den-uml-images
+doc: doxyfile @NEED_PLANTUML_TRUE@ gen-uml-images
+	@NEED_PLANTUML_TRUE@ doxyadd() { grep -q "\$\$[1] += \$\$[2]" doxyfile || sed -i '/^'"\$\$[1]"' *=/a'"\$\$[1]"' += '"\$\$[2]" doxyfile; }; \\
+	@NEED_PLANTUML_TRUE@ doxyadd ALIASES '"startuml{1}=@image html \\\\1\\\\n@image latex \\\\1\\\\n\\\\if DontIgnorePlantUMLCode"'; \\
+	@NEED_PLANTUML_TRUE@ doxyadd ALIASES '"enduml=\\\\endif"'; \\
+	@NEED_PLANTUML_TRUE@ doxyadd IMAGE_PATH '"gen-uml-images"';
 	doxygen doxyfile
 @PEDANTIC_TRUE@	test \! -s doxygen.errors
 
diff --git a/bootstrap.sh b/bootstrap.sh
index 4f7ffa5..0e882ab 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1023,14 +1023,7 @@ if testtag AX_USE_DOXYGEN; then
         doxyadd ALIASES '"description=@DESCRIPTION@"'
         doxyadd ALIASES '"readme=@README_HTML@"'
         doxyadd ALIASES '"author=<a href="@AUTHOR_URL@" target="_blank">@AUTHOR_NAME@</a>"'
-        # hack plantuml for doxygen < 1.8.11
-        if test "1.8.11" = $((echo "1.8.11"; doxygen -v) | sort -V | head -1); then
-            doxyreplace PLANTUML_JAR_PATH '"@top_srcdir@/doc/plantuml.jar"'
-        else
-            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
+        doxyreplace PLANTUML_JAR_PATH '"@top_srcdir@/doc/plantuml.jar"'
         doxyreplace ENABLE_PREPROCESSING YES
         doxyreplace MACRO_EXPANSION YES
         doxyadd PREDEFINED '"NAMESPACE=@PACKAGE_NAME@"'
diff --git a/nodejs/doc/documentation.dox b/nodejs/doc/documentation.dox
index 809e4ab..a4adfbd 100644
--- a/nodejs/doc/documentation.dox
+++ b/nodejs/doc/documentation.dox
@@ -86,7 +86,7 @@
     enrcrypted, everything is open source. You can chat and you can
     write encrypted e-mails from the same address.
 
-    <a ahref="https://www.eff.org/de/node/82654">SafeChat provides</a>:
+    <a href="https://www.eff.org/de/node/82654">SafeChat provides</a>:
       - Encrypted in transit ✓
       - Encrypted so the provider can't read it ✓
       - You can verify contacts' identities ✓