aa166ca60f
Improve the spec file and conditionals used to maximize feature availability. Work is done with an eye toward syncing more closely with the IBS qemu spec file. More passes are needed but this was some of the low hanging fruit. OBS-URL: https://build.opensuse.org/request/show/408598 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=306
62 lines
2.0 KiB
Diff
62 lines
2.0 KiB
Diff
From 79607d09f8670a92feb8e63455f6be59842f985a Mon Sep 17 00:00:00 2001
|
|
From: Cole Robinson <crobinso@redhat.com>
|
|
Date: Fri, 6 May 2016 14:03:09 -0400
|
|
Subject: [PATCH] configure: add echo_version helper
|
|
|
|
Simplifies printing library versions, dependent on if the library
|
|
was even found
|
|
|
|
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
|
Message-id: 3c9ab16123e06bb4109771ef6ee8acd82d449ba0.1462557436.git.crobinso@redhat.com
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
(cherry picked from commit 02d34f62fdecb54637e5a66d254bd68fcbfa397f)
|
|
[BR: BSC#988855]
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
configure | 18 ++++++++----------
|
|
1 file changed, 8 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index b455035..767658e 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -4748,6 +4748,12 @@ EOF
|
|
fi
|
|
fi
|
|
|
|
+echo_version() {
|
|
+ if test "$1" = "yes" ; then
|
|
+ echo "($2)"
|
|
+ fi
|
|
+}
|
|
+
|
|
# prepend pixman and ftd flags after all config tests are done
|
|
QEMU_CFLAGS="$pixman_cflags $fdt_cflags $QEMU_CFLAGS"
|
|
libs_softmmu="$pixman_libs $libs_softmmu"
|
|
@@ -4805,11 +4811,7 @@ echo "GNUTLS hash $gnutls_hash"
|
|
echo "GNUTLS rnd $gnutls_rnd"
|
|
echo "libgcrypt $gcrypt"
|
|
echo "libgcrypt kdf $gcrypt_kdf"
|
|
-if test "$nettle" = "yes"; then
|
|
- echo "nettle $nettle ($nettle_version)"
|
|
-else
|
|
- echo "nettle $nettle"
|
|
-fi
|
|
+echo "nettle $nettle `echo_version $nettle $nettle_version`"
|
|
echo "nettle kdf $nettle_kdf"
|
|
echo "libtasn1 $tasn1"
|
|
echo "VTE support $vte"
|
|
@@ -4861,11 +4863,7 @@ echo "Trace backends $trace_backends"
|
|
if have_backend "simple"; then
|
|
echo "Trace output file $trace_file-<pid>"
|
|
fi
|
|
-if test "$spice" = "yes"; then
|
|
-echo "spice support $spice ($spice_protocol_version/$spice_server_version)"
|
|
-else
|
|
-echo "spice support $spice"
|
|
-fi
|
|
+echo "spice support $spice `echo_version $spice $spice_protocol_version/$spice_server_version`"
|
|
echo "rbd support $rbd"
|
|
echo "xfsctl support $xfs"
|
|
echo "smartcard support $smartcard"
|