Commit bf018a90 authored by Murray Cumming's avatar Murray Cumming
Browse files

Avoid the requierment for sphinx-build if documentation is disabled.

* configure.ac: Use AC_PATH_PROG() instead of AC_CHECK_PROG() so we get the
    path to use. Only check if --enable-documentation was used.
* docs/pyglom_reference/Makefile.am: Only build the html if
    --enable-documentation was used (not yet built by default anyway).
parent 6996b260
2010-04-19 Murray Cumming <murrayc@murrayc.com>
Avoid the requierment for sphinx-build if documentation is disabled.
* configure.ac: Use AC_PATH_PROG() instead of AC_CHECK_PROG() so we get the
path to use. Only check if --enable-documentation was used.
* docs/pyglom_reference/Makefile.am: Only build the html if
--enable-documentation was used (not yet built by default anyway).
2010-04-19 Murray Cumming <murrayc@murrayc.com>
 
Improved use of sphinx.
......
......@@ -259,8 +259,10 @@ MM_ARG_WITH_TAGFILE_DOC([glibmm-2.4.tag], [glibmm-2.4])
MM_ARG_WITH_TAGFILE_DOC([cairomm-1.0.tag], [cairomm-1.0])
MM_ARG_WITH_TAGFILE_DOC([pangomm-1.4.tag], [pangomm-1.4])
AC_CHECK_PROG([SPHINX_BUILD], [sphinx-build])
AC_SUBST([SPHINX_BUILD])
AS_IF([test "x$ENABLE_DOCUMENTATION" != xno],
[AC_PATH_PROG([SPHINX_BUILD], [sphinx-build], [sphinx-build])],
[AC_MSG_ERROR([[The documentation build is enabled, but the sphinx-build tool could not be found.]])]
)
AC_CONFIG_FILES([Makefile
docs/user-guide/Makefile
......
......@@ -8,8 +8,10 @@
# mkdir html
# mv glom_1_14.html html/index.html
if ENABLE_DOCUMENTATION
html:
rm -rf html
sphinx-build -b html ./ html/
$(SPHINX_BUILD) -b html ./ html/
endif
MAINTAINERCLEANFILES = html/* outdir
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment