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 <[email protected]> Tested-by: Eric Farman <[email protected]> Reviewed-by: Pierrick Bouvier <[email protected]> Suggested-by: Paolo Bonzini <[email protected]> [AJB: untangle changes since] Tested-by: Jared Rossi <[email protected]> Message-ID: <[email protected]> Signed-off-by: Alex Bennée <[email protected]> diff --git a/configure b/configure index 1973f023b1e..8f8fec4efc8 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 -- 2.47.3
