From a873076925e599afe3852f87546e479f23c279ba Mon Sep 17 00:00:00 2001

From: Hans de Goede <hdegoede@redhat.com>

Date: Tue, 25 Sep 2012 13:22:21 +0200

Subject: [PATCH 370/382] usb-redir: Adjust pkg-config check for

 usbredirparser .pc file rename (v2)

The usbredir 0.5 release introduced the new API for 64 bit packet ids, but

it kept the libusbredirparser.pc name as is, meaning that older versions of

qemu will still have their pkg-config check for usbredirparser fulfilled,

and build with the usb-redir device. Due to the API change there will be

some compiler warnings, but the build will succeed, however the usb-redir

device will be broken on 32 bit machines.

To solve this a new usbredir-0.5.2 release is coming, which renames the

libusbredirparser.pc file to libusbredirparser-0.5.pc, so that it will no

longer fulfill the pkg-config check of the qemu-1.2 and older releases,

stopping the (silent) breakage. This patch adjusts qemu master's configure

to properly detect the new usbredir release.

Changes in v2:

-Not only use the new .pc name in the check but also when getting cflags

 and libs!

Signed-off-by: Hans de Goede <hdegoede@redhat.com>

---

 configure | 6 +++---

 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure b/configure

index d63530a..6c8b8c9 100755

--- a/configure

+++ b/configure

@@ -2765,10 +2765,10 @@ fi

 # check for usbredirparser for usb network redirection support

 if test "$usb_redir" != "no" ; then

-    if $pkg_config --atleast-version=0.5 libusbredirparser >/dev/null 2>&1 ; then

+    if $pkg_config --atleast-version=0.5 libusbredirparser-0.5 >/dev/null 2>&1 ; then

         usb_redir="yes"

-        usb_redir_cflags=$($pkg_config --cflags libusbredirparser 2>/dev/null)

-        usb_redir_libs=$($pkg_config --libs libusbredirparser 2>/dev/null)

+        usb_redir_cflags=$($pkg_config --cflags libusbredirparser-0.5 2>/dev/null)

+        usb_redir_libs=$($pkg_config --libs libusbredirparser-0.5 2>/dev/null)

         QEMU_CFLAGS="$QEMU_CFLAGS $usb_redir_cflags"

         libs_softmmu="$libs_softmmu $usb_redir_libs"

     else

-- 

1.7.12