aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2021-12-09 15:48:01 +0100
committerThomas Huth <thuth@redhat.com>2021-12-15 08:08:59 +0100
commite6a52b3651a3b2be41ee3309bc05f9b1e2cf8b90 (patch)
tree8173a1666474740f2f3a73f7b1a88e594f245174 /configure
parent719051ca3fd0ee765d8a80670df1a0292aa566f0 (diff)
downloadqemu-e6a52b3651a3b2be41ee3309bc05f9b1e2cf8b90.zip
qemu-e6a52b3651a3b2be41ee3309bc05f9b1e2cf8b90.tar.gz
qemu-e6a52b3651a3b2be41ee3309bc05f9b1e2cf8b90.tar.bz2
Move the libssh setup from configure to meson.build
It's easier to do this in meson.build now. Message-Id: <20211209144801.148388-1-thuth@redhat.com> Acked-by: Richard W.M. Jones <rjones@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure27
1 files changed, 0 insertions, 27 deletions
diff --git a/configure b/configure
index 48c2177..bb99a40 100755
--- a/configure
+++ b/configure
@@ -344,7 +344,6 @@ debug_stack_usage="no"
crypto_afalg="no"
tls_priority="NORMAL"
tpm="$default_feature"
-libssh="$default_feature"
live_block_migration=${default_feature:-yes}
numa="$default_feature"
replication=${default_feature:-yes}
@@ -1078,10 +1077,6 @@ for opt do
;;
--enable-tpm) tpm="yes"
;;
- --disable-libssh) libssh="no"
- ;;
- --enable-libssh) libssh="yes"
- ;;
--disable-live-block-migration) live_block_migration="no"
;;
--enable-live-block-migration) live_block_migration="yes"
@@ -1448,7 +1443,6 @@ cat << EOF
live-block-migration Block migration in the main migration stream
coroutine-pool coroutine freelist (better performance)
tpm TPM support
- libssh ssh block device support
numa libnuma support
avx2 AVX2 optimization support
avx512f AVX512F optimization support
@@ -2562,21 +2556,6 @@ if test "$modules" = yes; then
fi
##########################################
-# libssh probe
-if test "$libssh" != "no" ; then
- if $pkg_config --exists "libssh >= 0.8.7"; then
- libssh_cflags=$($pkg_config libssh --cflags)
- libssh_libs=$($pkg_config libssh --libs)
- libssh=yes
- else
- if test "$libssh" = "yes" ; then
- error_exit "libssh required for --enable-libssh"
- fi
- libssh=no
- fi
-fi
-
-##########################################
# TPM emulation is only on POSIX
if test "$tpm" = ""; then
@@ -3636,12 +3615,6 @@ if test "$cmpxchg128" = "yes" ; then
echo "CONFIG_CMPXCHG128=y" >> $config_host_mak
fi
-if test "$libssh" = "yes" ; then
- echo "CONFIG_LIBSSH=y" >> $config_host_mak
- echo "LIBSSH_CFLAGS=$libssh_cflags" >> $config_host_mak
- echo "LIBSSH_LIBS=$libssh_libs" >> $config_host_mak
-fi
-
if test "$live_block_migration" = "yes" ; then
echo "CONFIG_LIVE_BLOCK_MIGRATION=y" >> $config_host_mak
fi