--- a/configure +++ a/configure @@ -192,7 +192,7 @@ gcov="no" gcov_tool="gcov" EXESUF="" prefix="/usr/local" -mandir="\${prefix}/share/man" +mandir="\${prefix}/man" datadir="\${prefix}/share" qemu_docdir="\${prefix}/share/doc/qemu" bindir="\${prefix}/bin" @@ -1980,7 +1980,7 @@ if test "$gtk" != "no"; then if $pkg_config --exists "$gtkpackage >= $gtkversion"; then gtk_cflags=`$pkg_config --cflags $gtkpackage` gtk_libs=`$pkg_config --libs $gtkpackage` - libs_softmmu="$gtk_libs $libs_softmmu" + libs_softmmu="$gtk_libs -lintl $libs_softmmu" gtk="yes" elif test "$gtk" = "yes"; then feature_not_found "gtk" "Install gtk2 or gtk3 (requires --with-gtkabi=3.0 option to configure) devel" @@ -3320,15 +3320,18 @@ if compile_prog "" "" ; then fi # Check if tools are available to build documentation. +#if test "$docs" != "no" ; then +# if has makeinfo && has pod2man; then +# docs=yes +# else +# if test "$docs" = "yes" ; then +# feature_not_found "docs" "Install texinfo and Perl/perl-podlators" +# fi +# docs=no +# fi +#fi if test "$docs" != "no" ; then - if has makeinfo && has pod2man; then - docs=yes - else - if test "$docs" = "yes" ; then - feature_not_found "docs" "Install texinfo and Perl/perl-podlators" - fi - docs=no - fi + docs=yes fi # Search for bswap_32 function @@ -3498,6 +3501,17 @@ fi # check for libusb if test "$libusb" != "no" ; then + cat > $TMPC << EOF +#include + +int main(void) { return libusb_get_port_path(NULL, NULL, NULL, 0); } +EOF + if compile_prog "-Werror" "-lusb -pthread" ; then + libusb="yes" + libusb_cflags="" + libusb_libs=-lusb + libs_softmmu="$libs_softmmu $libusb_libs" + else if $pkg_config --atleast-version=1.0.13 libusb-1.0; then libusb="yes" libusb_cflags=$($pkg_config --cflags libusb-1.0) @@ -3510,6 +3524,7 @@ if test "$libusb" != "no" ; then fi libusb="no" fi + fi fi # check for usbredirparser for usb network redirection support