X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=config%2Fgr_doxygen.m4;h=ca934431346af0e9140b59b5e0beaf053e242597;hb=58a1356ed70994c0f24afa8a276b7e62979c28cf;hp=43433098d1d43bfdc262214fc50fad4785230fbb;hpb=bf89a84441f33f17f29ce238d9920f87a4d3b540;p=debian%2Fgnuradio

diff --git a/config/gr_doxygen.m4 b/config/gr_doxygen.m4
index 43433098..ca934431 100644
--- a/config/gr_doxygen.m4
+++ b/config/gr_doxygen.m4
@@ -22,17 +22,12 @@ dnl
 AC_DEFUN([GR_CHECK_DOXYGEN],[
   AC_ARG_ENABLE(doxygen,
 		AC_HELP_STRING([--enable-doxygen],
-			       [enable documentation generation with doxygen (no)]))
+			       [enable documentation generation with doxygen (auto)]))
   AC_ARG_ENABLE(dot, AC_HELP_STRING([--enable-dot],[use 'dot' to generate graphs in doxygen (auto)]))
-  AC_ARG_ENABLE(html-docs,
-                AC_HELP_STRING([--enable-html-docs],[enable HTML generation with doxygen (yes)]),
-                [], [ enable_html_docs=yes])
-  AC_ARG_ENABLE(latex-docs,
-                AC_HELP_STRING([--enable-latex-docs],
-			       [enable LaTeX doc generation with doxygen (no)]),
-                [], [ enable_latex_docs=no])
 
-  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
@@ -45,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)
@@ -60,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)
 ])