--- a/configure
+++ a/configure
@@ -154,7 +154,7 @@ bigendian="no"
 mingw32="no"
 EXESUF=""
 prefix="/usr/local"
-mandir="\${prefix}/share/man"
+mandir="\${prefix}/man"
 datadir="\${prefix}/share"
 qemu_docdir="\${prefix}/share/doc/qemu"
 bindir="\${prefix}/bin"
@@ -1756,7 +1756,7 @@ if test "$gtk" != "no"; then
 	gtk_libs=`$pkg_config --libs $gtkpackage 2>/dev/null`
 	vte_cflags=`$pkg_config --cflags $vtepackage 2>/dev/null`
 	vte_libs=`$pkg_config --libs $vtepackage 2>/dev/null`
-	libs_softmmu="$gtk_libs $vte_libs $libs_softmmu"
+	libs_softmmu="$gtk_libs -lintl $vte_libs $libs_softmmu"
 	gtk="yes"
     else
 	if test "$gtk" = "yes" ; then
@@ -2511,15 +2511,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"
+#    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"
-    fi
-    docs=no
-  fi
+  docs=yes
 fi
 
 # Search for bswap_32 function
@@ -3134,18 +3134,29 @@ fi
 
 # check for libusb
 if test "$libusb" != "no" ; then
-    if $pkg_config --atleast-version=1.0.13 libusb-1.0 >/dev/null 2>&1 ; then
-        libusb="yes"
-	usb="libusb"
-        libusb_cflags=$($pkg_config --cflags libusb-1.0 2>/dev/null)
-        libusb_libs=$($pkg_config --libs libusb-1.0 2>/dev/null)
-        QEMU_CFLAGS="$QEMU_CFLAGS $libusb_cflags"
+    cat > $TMPC << EOF
+#include <libusb.h>
+
+int main(void) { return libusb_get_port_path(NULL, NULL, NULL, 0); }
+EOF
+    if compile_prog "-Werror" "-lusb" ; then
+        libusb_cflags=""
+        libusb_libs=-lusb
         libs_softmmu="$libs_softmmu $libusb_libs"
     else
-        if test "$libusb" = "yes"; then
-            feature_not_found "libusb"
+        if $pkg_config --atleast-version=1.0.13 libusb-1.0 >/dev/null 2>&1 ; then
+            libusb="yes"
+            usb="libusb"
+            libusb_cflags=$($pkg_config --cflags libusb-1.0 2>/dev/null)
+            libusb_libs=$($pkg_config --libs libusb-1.0 2>/dev/null)
+            QEMU_CFLAGS="$QEMU_CFLAGS $libusb_cflags"
+            libs_softmmu="$libs_softmmu $libusb_libs"
+        else
+            if test "$libusb" = "yes"; then
+                feature_not_found "libusb"
+            fi
+            libusb="no"
         fi
-        libusb="no"
     fi
 fi