[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v3 17/20] configure: move --enable-docs and --disable-docs ba
From: |
John Snow |
Subject: |
[RFC PATCH v3 17/20] configure: move --enable-docs and --disable-docs back to configure |
Date: |
Mon, 24 Apr 2023 16:02:45 -0400 |
Move this option back from meson into configure for the purposes of
using the configuration value to bootstrap Sphinx in different ways
based on this value.
Signed-off-by: John Snow <jsnow@redhat.com>
---
configure | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/configure b/configure
index 7421bb8364..ae55de1408 100755
--- a/configure
+++ b/configure
@@ -279,6 +279,7 @@ debug_tcg="no"
sanitizers="no"
tsan="no"
fortify_source="yes"
+docs="auto"
EXESUF=""
modules="no"
prefix="/usr/local"
@@ -752,6 +753,10 @@ for opt do
;;
--disable-debug-info) meson_option_add -Ddebug=false
;;
+ --enable-docs) docs=enabled
+ ;;
+ --disable-docs) docs=disabled
+ ;;
--enable-modules)
modules="yes"
;;
@@ -2638,6 +2643,7 @@ if test "$skip_meson" = no; then
# QEMU options
test "$cfi" != false && meson_option_add "-Dcfi=$cfi"
+ test "$docs" != auto && meson_option_add "-Ddocs=$docs"
test "$fdt" != auto && meson_option_add "-Dfdt=$fdt"
test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add
"-Dfuzzing_engine=$LIB_FUZZING_ENGINE"
test "$qemu_suffix" != qemu && meson_option_add "-Dqemu_suffix=$qemu_suffix"
--
2.39.2
- [RFC PATCH v3 13/20] configure: create a python venv unconditionally, (continued)
- [RFC PATCH v3 01/20] python: update pylint configuration, John Snow, 2023/04/24
- [RFC PATCH v3 16/20] tests: Use configure-provided pyvenv for tests, John Snow, 2023/04/24
- [RFC PATCH v3 17/20] configure: move --enable-docs and --disable-docs back to configure,
John Snow <=
- [RFC PATCH v3 19/20] configure: use --diagnose option with meson ensure, John Snow, 2023/04/24
- [RFC PATCH v3 18/20] mkvenv: add diagnose() method for ensure() failures, John Snow, 2023/04/24
- [RFC PATCH v3 20/20] configure: bootstrap sphinx with mkvenv, John Snow, 2023/04/24
- Re: [RFC PATCH v3 00/20] configure: create a python venv and ensure meson, sphinx, Daniel P . Berrangé, 2023/04/25
- Re: [RFC PATCH v3 00/20] configure: create a python venv and ensure meson, sphinx, John Snow, 2023/04/25
- Re: [RFC PATCH v3 00/20] configure: create a python venv and ensure meson, sphinx, John Snow, 2023/04/25
- Re: [RFC PATCH v3 00/20] configure: create a python venv and ensure meson, sphinx, Daniel P . Berrangé, 2023/04/25
- Re: [RFC PATCH v3 00/20] configure: create a python venv and ensure meson, sphinx, John Snow, 2023/04/25
- Re: [RFC PATCH v3 00/20] configure: create a python venv and ensure meson, sphinx, Daniel P . Berrangé, 2023/04/26
- Re: [RFC PATCH v3 00/20] configure: create a python venv and ensure meson, sphinx, Paolo Bonzini, 2023/04/26