From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: "Richard W . M . Jones" <rjones@redhat.com>,
qemu-devel@nongnu.org, Pino Toscano <ptoscano@redhat.com>
Cc: "Kevin Wolf" <kwolf@redhat.com>,
qemu-block@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
"Max Reitz" <mreitz@redhat.com>, 周文青 <1151451036@qq.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [Qemu-devel] [PATCH 4/4] configure: Log the libssh version detected
Date: Wed, 14 Aug 2019 14:15:27 +0200 [thread overview]
Message-ID: <20190814121527.17876-5-philmd@redhat.com> (raw)
In-Reply-To: <20190814121527.17876-1-philmd@redhat.com>
Log wether the version is 0.7 or 0.8 to better understand
user reports.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
configure | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 040aa8eb6c..d06cee0ba0 100755
--- a/configure
+++ b/configure
@@ -3930,6 +3930,7 @@ if test "$libssh" != "no" ; then
if $pkg_config --exists libssh; then
libssh_cflags=$($pkg_config libssh --cflags)
libssh_libs=$($pkg_config libssh --libs)
+ libssh_version=$($pkg_config libssh --modversion)
libssh=yes
else
if test "$libssh" = "yes" ; then
@@ -3960,6 +3961,9 @@ int main(void) { return ssh_get_publickey(NULL, NULL); }
EOF
if compile_object "$libssh_cflags -DHAVE_LIBSSH_0_8"; then
libssh_cflags="-DHAVE_LIBSSH_0_8 $libssh_cflags"
+ else
+ # If this is not libssh 0.8, this is likely 0.7
+ libssh_version="0.7"
fi
if compile_object "$libssh_cflags -DHAVE_SSH_GET_SERVER_PUBLICKEY"; then
libssh_cflags="-DHAVE_SSH_GET_SERVER_PUBLICKEY $libssh_cflags"
@@ -6466,7 +6470,7 @@ echo "GlusterFS support $glusterfs"
echo "gcov $gcov_tool"
echo "gcov enabled $gcov"
echo "TPM support $tpm"
-echo "libssh support $libssh"
+echo "libssh support $libssh $(echo_version $libssh $libssh_version)"
echo "QOM debugging $qom_cast_debug"
echo "Live block migration $live_block_migration"
echo "lzo support $lzo"
--
2.20.1
next prev parent reply other threads:[~2019-08-14 12:20 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-14 12:15 [Qemu-devel] [PATCH 0/4] configure: Fix libssh on Ubuntu 18.04 Philippe Mathieu-Daudé
2019-08-14 12:15 ` [Qemu-devel] [RFC PATCH 1/4] configure: Improve libssh check Philippe Mathieu-Daudé
2019-08-14 12:36 ` Pino Toscano
2019-08-14 12:15 ` [Qemu-devel] [PATCH 2/4] configure: Avoid using libssh deprecated API Philippe Mathieu-Daudé
2019-08-14 12:35 ` Pino Toscano
2019-08-14 13:27 ` Andrea Bolognani
2019-08-14 14:15 ` Philippe Mathieu-Daudé
2019-08-14 14:51 ` Andrea Bolognani
2019-08-14 15:14 ` Philippe Mathieu-Daudé
2019-08-15 8:52 ` Andrea Bolognani
2019-08-14 12:15 ` [Qemu-devel] [PATCH 3/4] configure: Improve checking libssh version is 0.8 Philippe Mathieu-Daudé
2019-08-14 12:39 ` Pino Toscano
2019-08-14 12:15 ` Philippe Mathieu-Daudé [this message]
2019-08-14 12:29 ` [Qemu-devel] [PATCH 4/4] configure: Log the libssh version detected Richard W.M. Jones
2019-08-14 12:41 ` Pino Toscano
2019-08-14 16:45 ` [Qemu-devel] [PATCH 0/4] configure: Fix libssh on Ubuntu 18.04 no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190814121527.17876-5-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=1151451036@qq.com \
--cc=alex.bennee@linaro.org \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=ptoscano@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=rjones@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).