Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
configure: move --enable-docs and --disable-docs back to configure
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>
Message-Id: <20230511035435.734312-21-jsnow@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
jnsnow authored and bonzini committed May 18, 2023
1 parent 9c6692d commit 6b0cedc
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions configure
Expand Up @@ -279,6 +279,7 @@ debug_tcg="no"
sanitizers="no"
tsan="no"
fortify_source="yes"
docs="auto"
EXESUF=""
modules="no"
prefix="/usr/local"
Expand Down Expand Up @@ -750,6 +751,10 @@ for opt do
;;
--disable-debug-info) meson_option_add -Ddebug=false
;;
--enable-docs) docs=enabled
;;
--disable-docs) docs=disabled
;;
--enable-modules)
modules="yes"
;;
Expand Down Expand Up @@ -2615,6 +2620,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"
Expand Down

0 comments on commit 6b0cedc

Please sign in to comment.