[Openocd-development] [PATCH 2/2] allow documentation to be configured

[Zachary T W. <zw...@su...>]

Add --disable-manual-html and --enable-manual-pdf options to the
configure script, allowing user to change the defaults.  These
update the proess of munging the Doxygen configuration file to
use the settings thusly provided.  Add options in README.

Signed-off-by: Zachary T Welch <zw...@su...>
---
 Doxyfile.in  |    4 ++--
 Makefile.am  |    5 ++++-
 README       |    3 +++
 configure.in |   17 +++++++++++++++++
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/Doxyfile.in b/Doxyfile.in
index 077db10..656e16d 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -764,7 +764,7 @@ IGNORE_PREFIX          =
 # If the GENERATE_HTML tag is set to YES (the default) Doxygen will
 # generate HTML output.
 
-GENERATE_HTML          = YES
+GENERATE_HTML          = @manual_as_html@
 
 # The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
@@ -981,7 +981,7 @@ FORMULA_FONTSIZE       = 10
 # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
 # generate Latex output.
 
-GENERATE_LATEX         = YES
+GENERATE_LATEX         = @manual_as_pdf@
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
diff --git a/Makefile.am b/Makefile.am
index be42c28..e60ea33 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,10 @@ Doxyfile: $(srcdir)/Doxyfile.in
 	@( \
 	  echo "### @@@ -= DO NOT EDIT THIS FILE =- @@@ ###" && \
 	  echo "### @@@ Make changes to Doxyfile.in @@@ ###" && \
-	  sed -e 's,@srcdir\@,$(srcdir),' $< \
+	  sed -e 's,@srcdir\@,$(srcdir),' \
+		-e 's,@manual_as_html\@,$(manual_as_html),' \
+		-e 's,@manual_as_pdf\@,$(manual_as_pdf),' \
+		$< \
 	) > $@
 
 THE_MANUAL = doxygen/latex/refman.pdf
diff --git a/README b/README
index 33258e8..1d4c3c5 100644
--- a/README
+++ b/README
@@ -258,6 +258,9 @@ options may be available there:
   --enable-httpd          Enable builtin httpd server - useful for standalone
                           OpenOCD implementations
 
+  --disable-manual-html   Disable building developer manual as HTML.
+  --enable-manual-pdf     Enable building developer manual as PDF.
+
 Miscellaneous Configure Options
 -------------------------------
 
diff --git a/configure.in b/configure.in
index fa2a498..70dba5c 100644
--- a/configure.in
+++ b/configure.in
@@ -277,6 +277,23 @@ AC_ARG_WITH(ftd2xx-lib,
   with_ftd2xx_lib=static
   ])
 
+AC_MSG_CHECKING([whether to build manual as HTML])
+AC_ARG_ENABLE(manaul-html,
+  AS_HELP_STRING([--disable-manual-html],
+    [Disable building developer manual as HTML.]),
+  [manual_as_html=$enableval], [manual_as_html=yes])
+AC_SUBST(manual_as_html)
+AC_MSG_RESULT($manual_as_html)
+
+AC_MSG_CHECKING([whether to build manual as PDF])
+AC_ARG_ENABLE(manaul-pdf,
+  AS_HELP_STRING([--enable-manual-pdf],
+    [Enable building developer manual as PDF.]),
+  [manual_as_pdf=$enableval], [manual_as_pdf=no])
+AC_SUBST(manual_as_pdf)
+AC_MSG_RESULT($manual_as_pdf)
+
+
 AC_ARG_ENABLE(gccwarnings,
   AS_HELP_STRING([--disable-gccwarnings], [Disable compiler warnings]),
   [gcc_warnings=$enableval], [gcc_warnings=yes])
-- 
1.6.4.4