configure: move non-command-line variables away from command-line parsing section
This makes it easier to identify candidates for moving to Meson. Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
a70248dbd3
commit
3b0d864384
13
configure
vendored
13
configure
vendored
@ -307,16 +307,12 @@ debug="no"
|
|||||||
sanitizers="no"
|
sanitizers="no"
|
||||||
tsan="no"
|
tsan="no"
|
||||||
fortify_source="$default_feature"
|
fortify_source="$default_feature"
|
||||||
mingw32="no"
|
|
||||||
gcov="no"
|
gcov="no"
|
||||||
EXESUF=""
|
EXESUF=""
|
||||||
modules="no"
|
modules="no"
|
||||||
module_upgrades="no"
|
module_upgrades="no"
|
||||||
prefix="/usr/local"
|
prefix="/usr/local"
|
||||||
qemu_suffix="qemu"
|
qemu_suffix="qemu"
|
||||||
bsd="no"
|
|
||||||
linux="no"
|
|
||||||
solaris="no"
|
|
||||||
profiler="no"
|
profiler="no"
|
||||||
softmmu="yes"
|
softmmu="yes"
|
||||||
linux_user=""
|
linux_user=""
|
||||||
@ -330,8 +326,6 @@ opengl="$default_feature"
|
|||||||
cpuid_h="no"
|
cpuid_h="no"
|
||||||
avx2_opt="$default_feature"
|
avx2_opt="$default_feature"
|
||||||
guest_agent="$default_feature"
|
guest_agent="$default_feature"
|
||||||
guest_agent_with_vss="no"
|
|
||||||
guest_agent_ntddscsi="no"
|
|
||||||
vss_win32_sdk="$default_feature"
|
vss_win32_sdk="$default_feature"
|
||||||
win_sdk="no"
|
win_sdk="no"
|
||||||
want_tools="$default_feature"
|
want_tools="$default_feature"
|
||||||
@ -526,6 +520,10 @@ fi
|
|||||||
|
|
||||||
# OS specific
|
# OS specific
|
||||||
|
|
||||||
|
mingw32="no"
|
||||||
|
bsd="no"
|
||||||
|
linux="no"
|
||||||
|
solaris="no"
|
||||||
case $targetos in
|
case $targetos in
|
||||||
windows)
|
windows)
|
||||||
mingw32="yes"
|
mingw32="yes"
|
||||||
@ -2549,6 +2547,7 @@ fi
|
|||||||
##########################################
|
##########################################
|
||||||
# check if we have VSS SDK headers for win
|
# check if we have VSS SDK headers for win
|
||||||
|
|
||||||
|
guest_agent_with_vss="no"
|
||||||
if test "$mingw32" = "yes" && test "$guest_agent" != "no" && \
|
if test "$mingw32" = "yes" && test "$guest_agent" != "no" && \
|
||||||
test "$vss_win32_sdk" != "no" ; then
|
test "$vss_win32_sdk" != "no" ; then
|
||||||
case "$vss_win32_sdk" in
|
case "$vss_win32_sdk" in
|
||||||
@ -2579,7 +2578,6 @@ EOF
|
|||||||
echo "ERROR: The headers are extracted in the directory \`inc'."
|
echo "ERROR: The headers are extracted in the directory \`inc'."
|
||||||
feature_not_found "VSS support"
|
feature_not_found "VSS support"
|
||||||
fi
|
fi
|
||||||
guest_agent_with_vss="no"
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -2606,6 +2604,7 @@ fi
|
|||||||
|
|
||||||
##########################################
|
##########################################
|
||||||
# check if mingw environment provides a recent ntddscsi.h
|
# check if mingw environment provides a recent ntddscsi.h
|
||||||
|
guest_agent_ntddscsi="no"
|
||||||
if test "$mingw32" = "yes" && test "$guest_agent" != "no"; then
|
if test "$mingw32" = "yes" && test "$guest_agent" != "no"; then
|
||||||
cat > $TMPC << EOF
|
cat > $TMPC << EOF
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user