diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-10-04 19:49:15 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-10-04 19:49:15 -0500 |
| commit | 938406dfb11d8a40d9228b3596d49a583d7218ff (patch) | |
| tree | e573870cfe8fa52868b4442b9f0bae799e44e537 /configure | |
| parent | 4be403c8158e1b6be743f0fef004310cea4e3975 (diff) | |
| parent | 39c138c8420f51a7da7b35233a8d7400a0b589ac (diff) | |
| download | qemu-938406dfb11d8a40d9228b3596d49a583d7218ff.tar.gz | |
Merge remote-tracking branch 'kraxel/usb.66' into staging
* kraxel/usb.66:
usb: Fix usb_packet_map() in the presence of IOMMUs
usb-redir: Adjust pkg-config check for usbredirparser .pc file rename (v2)
ehci: Fix interrupt packet MULT handling
xhci: create a memory region for each port
xhci: route string & usb hub support
xhci: tweak limits
compat: turn off msi/msix on xhci for old machine types
add pc-1.3 machine type
Conflicts:
hw/pc_piix.c
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -2748,10 +2748,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 |