Imported Upstream version 3.2.2

[debian/gnuradio] / config / gr_doxygen.m4

diff --git a/config/gr_doxygen.m4 b/config/gr_doxygen.m4
index 4670c29d27e2b56d8b624052c85293f405e4fa24..ca934431346af0e9140b59b5e0beaf053e242597 100644 (file)
--- a/config/gr_doxygen.m4
+++ b/config/gr_doxygen.m4
@@ -20,12 +20,14 @@ dnl Boston, MA 02110-1301, USA.
 dnl 
 
 AC_DEFUN([GR_CHECK_DOXYGEN],[
-  AC_ARG_ENABLE(doxygen, [  --enable-doxygen        enable documentation generation with doxygen (no)])
-  AC_ARG_ENABLE(dot, [  --enable-dot            use 'dot' to generate graphs in doxygen (auto)])
-  AC_ARG_ENABLE(html-docs, [  --enable-html-docs      enable HTML generation with doxygen (yes)], [], [ enable_html_docs=yes])
-  AC_ARG_ENABLE(latex-docs, [  --enable-latex-docs     enable LaTeX doc generation with doxygen (no)], [], [ enable_latex_docs=no])
+  AC_ARG_ENABLE(doxygen,
+               AC_HELP_STRING([--enable-doxygen],
+                              [enable documentation generation with doxygen (auto)]))
+  AC_ARG_ENABLE(dot, AC_HELP_STRING([--enable-dot],[use 'dot' to generate graphs in doxygen (auto)]))
 
-  if test "x$enable_doxygen" = xyes; then
+  if test "x$enable_doxygen" = xno; then
+        enable_doc=no
+  else
         AC_PATH_PROG(DOXYGEN, doxygen, , $PATH)
         if test x$DOXYGEN = x; then
                 if test "x$enable_doxygen" = xyes; then
@@ -38,8 +40,6 @@ AC_DEFUN([GR_CHECK_DOXYGEN],[
                generate_docs=docs
                 AC_PATH_PROG(DOT, dot, , $PATH)
         fi
-  else 
-        enable_doc=no
   fi
 
   AM_CONDITIONAL(DOC, test x$enable_doc = xyes)
@@ -53,7 +53,8 @@ AC_DEFUN([GR_CHECK_DOXYGEN],[
         enable_dot=yes
   fi
   AC_SUBST(enable_dot)
-  AC_SUBST(enable_html_docs)
-  AC_SUBST(enable_latex_docs)
+  AC_SUBST(enable_xml_docs, YES)
+  AC_SUBST(enable_html_docs, YES)
+  AC_SUBST(enable_latex_docs, NO)
   AC_SUBST(generate_docs)
 ])