[Stable-8.2.5,09/21] configure: quote -D options that are passed through to meson

Commit Message

Michael Tokarev May 27, 2024, 7:24 a.m. UTC

From: Paolo Bonzini <[e-mail]>

Ensure that they go through unmodified, instead of removing one layer
of quoting.

-D is a pretty specialized option and most options that can have spaces
do not need it (for example, c_args is covered by --extra-cflags).
Therefore it's unlikely that this causes actual trouble.  However,
a somewhat realistic failure case would be with -Dpkg_config_path
and a pkg-config directory that contains spaces.

Cc: [e-mail]
Reviewed-by: Thomas Huth <[e-mail]>
Signed-off-by: Paolo Bonzini <[e-mail]>
(cherry picked from commit 23b1f53c2c8990ed745acede171e49645af3d6d0)
Signed-off-by: Michael Tokarev <[e-mail]>

Patch

diff --git a/configure b/configure
index 163729c3ec..66ca736621 100755
--- a/configure
+++ b/configure
@@ -761,7 +761,7 @@  for opt do
   --*) meson_option_parse "$opt" "$optarg"
   ;;
   # Pass through -Dxxxx options to meson
-  -D*) meson_options="$meson_options $opt"
+  -D*) meson_option_add "$opt"
   ;;
   esac
 done