diff options
| author | John Snow <jsnow@redhat.com> | 2023-05-10 23:54:29 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-05-18 08:53:51 +0200 |
| commit | 6f6652ebc2717b28c5788e6364c6dab09bb0ac44 (patch) | |
| tree | 4f9ff0d7c22e8ba1639bac84504fedbe42e603ac /docs | |
| parent | 6b0cedcdc7c52feda1a6b5d6c6f30356290af0ec (diff) | |
| download | qemu-6f6652ebc2717b28c5788e6364c6dab09bb0ac44.zip qemu-6f6652ebc2717b28c5788e6364c6dab09bb0ac44.tar.gz qemu-6f6652ebc2717b28c5788e6364c6dab09bb0ac44.tar.bz2 | |
configure: bootstrap sphinx with mkvenv
When docs are explicitly requested, require Sphinx>=1.6.0. When docs are
explicitly disabled, don't bother to check for Sphinx at all. If docs
are set to "auto", attempt to locate Sphinx, but continue onward if it
wasn't located.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20230511035435.734312-22-jsnow@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/conf.py | 9 | ||||
| -rw-r--r-- | docs/meson.build | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/docs/conf.py b/docs/conf.py index 00767b0..c687ff2 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -32,15 +32,6 @@ import sphinx from distutils.version import LooseVersion from sphinx.errors import ConfigError -# Make Sphinx fail cleanly if using an old Python, rather than obscurely -# failing because some code in one of our extensions doesn't work there. -# In newer versions of Sphinx this will display nicely; in older versions -# Sphinx will also produce a Python backtrace but at least the information -# gets printed... -if sys.version_info < (3,6): - raise ConfigError( - "QEMU requires a Sphinx that uses Python 3.6 or better\n") - # The per-manual conf.py will set qemu_docdir for a single-manual build; # otherwise set it here if this is an entire-manual-set build. # This is always the absolute path of the docs/ directory in the source tree. diff --git a/docs/meson.build b/docs/meson.build index 6d09865..9040f86 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -1,4 +1,4 @@ -sphinx_build = find_program(get_option('sphinx_build'), +sphinx_build = find_program(fs.parent(python.full_path()) / 'sphinx-build', required: get_option('docs')) # Check if tools are available to build documentation. |