Commit aec052ac47 for qemu.org

commit aec052ac47089d25525e1e14a632d3670dcce230
Author: Alex Bennée <alex.bennee@linaro.org>
Date:   Thu Sep 17 17:55:46 2026 +0100

    configure: ensure it also honours container configuration

    This partially reverts the bits of 522b299ca43 (tests/tcg/meson.build:
    implement ./configure containers options) so the configure script can
    also honour the container config while keeping the plumbing to control
    containers within meson.

    Tested-by: Richard Henderson <richard.henderson@linaro.org>
    Tested-by: Eric Farman <farman@linux.ibm.com>
    Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
    Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
    [AJB: untangle changes since]
    Tested-by: Jared Rossi <jrossi@linux.ibm.com>
    Message-ID: <20260917165602.3405537-3-alex.bennee@linaro.org>
    Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/configure b/configure
index 1973f023b1..8f8fec4efc 100755
--- a/configure
+++ b/configure
@@ -246,6 +246,7 @@ ninja=""
 python=
 download="enabled"
 skip_meson=no
+use_containers="yes"
 rust="disabled"
 rust_target_triple=""

@@ -722,11 +723,14 @@ for opt do
   ;;
   --disable-plugins) plugins="no"
   ;;
-  --enable-containers) # enabled by default
+  --enable-containers) use_containers="yes"
+                       meson_option_add -Dcontainers=true
   ;;
-  --disable-containers) meson_option_add -Dcontainers=false
+  --disable-containers) use_containers="no"
+                        meson_option_add -Dcontainers=false
   ;;
-  --container-command=*) meson_option_add -Dcontainer_command="$optarg"
+  --container-command=*) container_command="$optarg"
+                         meson_option_add -Dcontainer_command="$optarg"
   ;;
   --rust-target-triple=*) rust_target_triple="$optarg"
   ;;
@@ -1713,6 +1717,9 @@ echo all: >> $config_host_mak

 echo "SRC_PATH=$source_path" >> $config_host_mak
 echo "TARGET_DIRS=$target_list" >> $config_host_mak
+if test "$container_command" != ""; then
+    echo "CONTAINER_COMMAND=$container_command" >> $config_host_mak
+fi
 echo "SUBDIRS=$subdirs" >> $config_host_mak
 echo "PYTHON=$python" >> $config_host_mak
 echo "MKVENV_ENSUREGROUP=$mkvenv ensuregroup $mkvenv_online_flag" >> $config_host_mak