[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/8] configure: move non-command-line variables away from command
From: |
Paolo Bonzini |
Subject: |
[PATCH 5/8] configure: move non-command-line variables away from command-line parsing section |
Date: |
Tue, 21 Dec 2021 12:05:23 +0100 |
This makes it easier to identify candidates for moving to Meson.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index 40dd6e8d1b..810bc36490 100755
--- a/configure
+++ b/configure
@@ -308,16 +308,12 @@ debug="no"
sanitizers="no"
tsan="no"
fortify_source="$default_feature"
-mingw32="no"
gcov="no"
EXESUF=""
modules="no"
module_upgrades="no"
prefix="/usr/local"
qemu_suffix="qemu"
-bsd="no"
-linux="no"
-solaris="no"
profiler="no"
softmmu="yes"
linux_user=""
@@ -331,8 +327,6 @@ opengl="$default_feature"
cpuid_h="no"
avx2_opt="$default_feature"
guest_agent="$default_feature"
-guest_agent_with_vss="no"
-guest_agent_ntddscsi="no"
vss_win32_sdk="$default_feature"
win_sdk="no"
want_tools="$default_feature"
@@ -527,6 +521,10 @@ fi
# OS specific
+mingw32="no"
+bsd="no"
+linux="no"
+solaris="no"
case $targetos in
windows)
mingw32="yes"
@@ -2574,6 +2572,7 @@ fi
##########################################
# check if we have VSS SDK headers for win
+guest_agent_with_vss="no"
if test "$mingw32" = "yes" && test "$guest_agent" != "no" && \
test "$vss_win32_sdk" != "no" ; then
case "$vss_win32_sdk" in
@@ -2604,7 +2603,6 @@ EOF
echo "ERROR: The headers are extracted in the directory \`inc'."
feature_not_found "VSS support"
fi
- guest_agent_with_vss="no"
fi
fi
@@ -2631,6 +2629,7 @@ fi
##########################################
# check if mingw environment provides a recent ntddscsi.h
+guest_agent_ntddscsi="no"
if test "$mingw32" = "yes" && test "$guest_agent" != "no"; then
cat > $TMPC << EOF
#include <windows.h>
--
2.33.1
- [PATCH 0/8] Next round of configure/meson cleanups, Paolo Bonzini, 2021/12/21
- [PATCH 1/8] configure: simplify creation of plugin symbol list, Paolo Bonzini, 2021/12/21
- [PATCH 2/8] configure: do not set bsd_user/linux_user early, Paolo Bonzini, 2021/12/21
- [PATCH 3/8] configure, makefile: remove traces of really old files, Paolo Bonzini, 2021/12/21
- [PATCH 5/8] configure: move non-command-line variables away from command-line parsing section,
Paolo Bonzini <=
- [PATCH 7/8] configure, meson: move config-poison.h to meson, Paolo Bonzini, 2021/12/21
- [PATCH 4/8] configure: parse --enable/--disable-strip automatically, flip default, Paolo Bonzini, 2021/12/21
- [PATCH 8/8] meson: add comments in the target-specific flags section, Paolo Bonzini, 2021/12/21
- [PATCH 6/8] meson: build contrib/ executables after generated headers, Paolo Bonzini, 2021/12/21