Browse Source

Allow using --enable-build-doc even if the html documentation was already built

Samuel Thibault 4 years ago
parent
commit
bc328579b7
1 changed files with 16 additions and 13 deletions
  1. 16 13
      configure.ac

+ 16 - 13
configure.ac

@@ -3392,13 +3392,27 @@ AM_CONDITIONAL(STARPU_BUILD_STARPURM_EXAMPLES, [test x$enable_starpurm_examples
 # Documentation                          #
 ##########################################
 
+enable_build_doc="yes"
+enable_build_doc_pdf="no"
+available_doc="no"
+if test -d "$srcdir/doc/doxygen/html" ; then
+   enable_build_doc="no"
+   available_doc="yes"
+fi
+available_doc_pdf="no"
+if test -f "$srcdir/doc/doxygen/starpu.pdf" ; then
+   enable_build_doc="no"
+   enable_build_doc_pdf="no"
+   available_doc_pdf="yes"
+fi
+
 AC_ARG_ENABLE(build-doc, [AS_HELP_STRING([--disable-build-doc],
 			[disable building of documentation])],
-			enable_build_doc=$enableval, enable_build_doc=yes)
+			enable_build_doc=$enableval)
 
 AC_ARG_ENABLE(build-doc-pdf, [AS_HELP_STRING([--enable-build-doc-pdf],
 			[enable building of PDF documentation])],
-			enable_build_doc_pdf=$enableval, enable_build_doc_pdf=no)
+			enable_build_doc_pdf=$enableval)
 
 # Check whether doxygen needed tools are installed
 AC_PATH_PROG(doxygencommand, doxygen)
@@ -3415,17 +3429,6 @@ if test "$epstopdfcommand" = "" ; then
    enable_build_doc_pdf="no"
 fi
 
-available_doc="no"
-if test -d "$srcdir/doc/doxygen/html" ; then
-   enable_build_doc="no"
-   available_doc="yes"
-fi
-available_doc_pdf="no"
-if test -f "$srcdir/doc/doxygen/starpu.pdf" ; then
-   enable_build_doc="no"
-   enable_build_doc_pdf="no"
-   available_doc_pdf="yes"
-fi
 AC_MSG_CHECKING(whether HTML documentation should be compiled)
 AC_MSG_RESULT($enable_build_doc)
 AC_MSG_CHECKING(whether HTML documentation is available)