瀏覽代碼

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>
John Snow 2 年之前
父節點
當前提交
6b0cedcdc7
共有 1 個文件被更改,包括 6 次插入0 次删除
  1. 6 0
      configure

+ 6 - 0
configure

@@ -279,6 +279,7 @@ debug_tcg="no"
 sanitizers="no"
 sanitizers="no"
 tsan="no"
 tsan="no"
 fortify_source="yes"
 fortify_source="yes"
+docs="auto"
 EXESUF=""
 EXESUF=""
 modules="no"
 modules="no"
 prefix="/usr/local"
 prefix="/usr/local"
@@ -750,6 +751,10 @@ for opt do
   ;;
   ;;
   --disable-debug-info) meson_option_add -Ddebug=false
   --disable-debug-info) meson_option_add -Ddebug=false
   ;;
   ;;
+  --enable-docs) docs=enabled
+  ;;
+  --disable-docs) docs=disabled
+  ;;
   --enable-modules)
   --enable-modules)
       modules="yes"
       modules="yes"
   ;;
   ;;
@@ -2615,6 +2620,7 @@ if test "$skip_meson" = no; then
 
 
   # QEMU options
   # QEMU options
   test "$cfi" != false && meson_option_add "-Dcfi=$cfi"
   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 "$fdt" != auto && meson_option_add "-Dfdt=$fdt"
   test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add "-Dfuzzing_engine=$LIB_FUZZING_ENGINE"
   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"
   test "$qemu_suffix" != qemu && meson_option_add "-Dqemu_suffix=$qemu_suffix"