diff options
author | Tomek Mrugalski <tomasz@isc.org> | 2019-06-12 20:30:26 +0200 |
---|---|---|
committer | Michal Nowikowski <godfryd@isc.org> | 2019-07-30 10:45:12 +0200 |
commit | a1adbffd91702ddc30c8cf0923417e37e18d87f4 (patch) | |
tree | 0562c7341d7601d7f6c22632285f9a4778ff8ac8 /configure.ac | |
parent | initial conversion of kea guide from docbook to rst/sphinx (diff) | |
download | kea-a1adbffd91702ddc30c8cf0923417e37e18d87f4.tar.xz kea-a1adbffd91702ddc30c8cf0923417e37e18d87f4.zip |
Initial changes to have sphinx detected
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 40 |
1 files changed, 12 insertions, 28 deletions
diff --git a/configure.ac b/configure.ac index aad60a0250..8d5085ac31 100644 --- a/configure.ac +++ b/configure.ac @@ -1435,46 +1435,30 @@ fi AM_CONDITIONAL([GENERATE_PARSER], [test x$enable_generate_parser != xno]) AC_ARG_ENABLE(generate_docs, [AC_HELP_STRING([--enable-generate-docs], - [regenerate documentation using Docbook [default=no]])], + [regenerate documentation using Sphinx [default=no]])], enable_generate_docs=$enableval, enable_generate_docs=no) if test "x$enable_generate_docs" != xno ; then -# xsltproc --nonet parameter - NONET="--nonet" - AC_ARG_VAR(XSLTPROC_NET, [xsltproc uses the Internet to fetch DTDs, entities or documents.]) - if test "x$XSLTPROC_NET" != x ; then - NONET= - fi - AC_SUBST(NONET) - # Check for xsltproc - AC_PATH_PROG([XSLTPROC], [xsltproc]) - if test -z "$XSLTPROC"; then - AC_MSG_ERROR("xsltproc not found; it is required for --enable-generate-docs") + AC_PATH_PROG([SPHINX], [sphinx-build]) + if test -z "$SPHINX"; then + AC_MSG_ERROR([sphinx-build not found; it is required for --enable-generate-docs, please see http://www.sphinx-doc.org/en/master/usage/installation.html for details]) else - AC_MSG_CHECKING([if $XSLTPROC works]) - # run xsltproc to see if works - $XSLTPROC --novalid --xinclude $NONET http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl - if test $? -ne 0 ; then - AC_MSG_ERROR("Error with $XSLTPROC using release/xsl/current/manpages/docbook.xsl") - fi - $XSLTPROC --novalid --xinclude $NONET http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl + AC_MSG_CHECKING([whether $SPHINX works]) + # run sphinx to see if it works + # We should probably do a more thorough checks + $SPHINX --version if test $? -ne 0 ; then - AC_MSG_ERROR("Error with $XSLTPROC using release/xsl/current/html/docbook.xsl") + AC_MSG_ERROR("Error with $SPHINX --version") fi - AC_MSG_RESULT(yes) - fi - - AC_PATH_PROG([ELINKS], [elinks]) - if test -z "$ELINKS"; then - AC_MSG_ERROR("elinks not found; it is required for --enable-generate-docs") + AC_MSG_RESULT(yes (found in $SPHINX)) fi fi # Don't fail here if not found, used to generate PDF documentation. -AC_PATH_PROG([DBLATEX], [dblatex]) -AM_CONDITIONAL(HAVE_DBLATEX, test "x$DBLATEX" != "x") +#AC_PATH_PROG([DBLATEX], [dblatex]) +#AM_CONDITIONAL(HAVE_DBLATEX, test "x$DBLATEX" != "x") AM_CONDITIONAL(GENERATE_DOCS, test x$enable_generate_docs != xno) |