Merge commit '30c3f67' into bfgminer

configure.ac

@@ -240,13 +240,6 @@ PKG_CHECK_MODULES([LIBUSB], [libusb-1.0],[
 			],[#include <libusb.h>])
 	fi
 ])
-if test "x$libusb" = xyes; then
-	AC_DEFINE([HAVE_LIBUSB], [1], [Define if you have libusb-1.0])
-	save_CFLAGS="$CFLAGS"
-	CFLAGS="$LIBUSB_CFLAGS $CFLAGS"
-	AC_CHECK_DECLS([libusb_error_name],[],[],[#include <libusb.h>])
-	CFLAGS="$save_CFLAGS"
-fi
 
 AC_ARG_ENABLE([x6500],
 	[AC_HELP_STRING([--disable-x6500],[Compile support for X6500 (default if libusb)])],
@@ -287,6 +280,20 @@ fi
 AM_CONDITIONAL([HAS_ZTEX], [test x$ztex = xyes])
 
 
+if test "x$x6500$ztex" = "xnono"; then
+	libusb=no
+	LIBUSB_LIBS=''
+	LIBUSB_CFLAGS=''
+fi
+if test "x$libusb" = xyes; then
+	AC_DEFINE([HAVE_LIBUSB], [1], [Define if you have libusb-1.0])
+	save_CFLAGS="$CFLAGS"
+	CFLAGS="$LIBUSB_CFLAGS $CFLAGS"
+	AC_CHECK_DECLS([libusb_error_name],[],[],[#include <libusb.h>])
+	CFLAGS="$save_CFLAGS"
+fi
+
+
 scrypt="no"
 
 AC_ARG_ENABLE([scrypt],