mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 16:53:55 -06:00
configure, meson: convert libusb detection to meson
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
05e391ae40
commit
90540f3289
4 changed files with 14 additions and 28 deletions
27
configure
vendored
27
configure
vendored
|
@ -374,7 +374,7 @@ spice_protocol="auto"
|
|||
rbd="auto"
|
||||
smartcard="$default_feature"
|
||||
u2f="auto"
|
||||
libusb="$default_feature"
|
||||
libusb="auto"
|
||||
usb_redir="$default_feature"
|
||||
opengl="$default_feature"
|
||||
cpuid_h="no"
|
||||
|
@ -1285,9 +1285,9 @@ for opt do
|
|||
;;
|
||||
--enable-u2f) u2f="enabled"
|
||||
;;
|
||||
--disable-libusb) libusb="no"
|
||||
--disable-libusb) libusb="disabled"
|
||||
;;
|
||||
--enable-libusb) libusb="yes"
|
||||
--enable-libusb) libusb="enabled"
|
||||
;;
|
||||
--disable-usb-redir) usb_redir="no"
|
||||
;;
|
||||
|
@ -3994,20 +3994,6 @@ if test "$smartcard" != "no"; then
|
|||
fi
|
||||
fi
|
||||
|
||||
# check for libusb
|
||||
if test "$libusb" != "no" ; then
|
||||
if $pkg_config --atleast-version=1.0.13 libusb-1.0; then
|
||||
libusb="yes"
|
||||
libusb_cflags=$($pkg_config --cflags libusb-1.0)
|
||||
libusb_libs=$($pkg_config --libs libusb-1.0)
|
||||
else
|
||||
if test "$libusb" = "yes"; then
|
||||
feature_not_found "libusb" "Install libusb devel >= 1.0.13"
|
||||
fi
|
||||
libusb="no"
|
||||
fi
|
||||
fi
|
||||
|
||||
# check for usbredirparser for usb network redirection support
|
||||
if test "$usb_redir" != "no" ; then
|
||||
if $pkg_config --atleast-version=0.6 libusbredirparser-0.5; then
|
||||
|
@ -5631,12 +5617,6 @@ if test "$smartcard" = "yes" ; then
|
|||
echo "SMARTCARD_LIBS=$libcacard_libs" >> $config_host_mak
|
||||
fi
|
||||
|
||||
if test "$libusb" = "yes" ; then
|
||||
echo "CONFIG_USB_LIBUSB=y" >> $config_host_mak
|
||||
echo "LIBUSB_CFLAGS=$libusb_cflags" >> $config_host_mak
|
||||
echo "LIBUSB_LIBS=$libusb_libs" >> $config_host_mak
|
||||
fi
|
||||
|
||||
if test "$usb_redir" = "yes" ; then
|
||||
echo "CONFIG_USB_REDIR=y" >> $config_host_mak
|
||||
echo "USB_REDIR_CFLAGS=$usb_redir_cflags" >> $config_host_mak
|
||||
|
@ -6215,6 +6195,7 @@ if test "$skip_meson" = no; then
|
|||
-Dkvm=$kvm -Dhax=$hax -Dwhpx=$whpx -Dhvf=$hvf -Dnvmm=$nvmm \
|
||||
-Dxen=$xen -Dxen_pci_passthrough=$xen_pci_passthrough -Dtcg=$tcg \
|
||||
-Dcocoa=$cocoa -Dgtk=$gtk -Dmpath=$mpath -Dsdl=$sdl -Dsdl_image=$sdl_image \
|
||||
-Dlibusb=$libusb \
|
||||
-Dvnc=$vnc -Dvnc_sasl=$vnc_sasl -Dvnc_jpeg=$vnc_jpeg -Dvnc_png=$vnc_png \
|
||||
-Dgettext=$gettext -Dxkbcommon=$xkbcommon -Du2f=$u2f -Dvirtiofsd=$virtiofsd \
|
||||
-Dcapstone=$capstone -Dslirp=$slirp -Dfdt=$fdt -Dbrlapi=$brlapi \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue