| Message ID | 20190814121527.17876-5-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | configure: Fix libssh on Ubuntu 18.04 | expand |
The series seems fine, so:
Acked-by: Richard W.M. Jones <rjones@redhat.com>
If it was me I'd be inclined to file a bug against Ubuntu and get them
to fix their broken package instead :-)
Rich.
On Wednesday, 14 August 2019 14:15:27 CEST Philippe Mathieu-Daudé wrote: > 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 Not sure why this though -- please leave it out, and just log the version as found.
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"
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(-)