Commit ce72dbea7d7405ed37456c89c8b0516188f57fc7
2012-11-16T00:13:56
Find libusb-1.0 with pkg-config except on mingw, and fix #include path
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
diff --git a/configure.ac b/configure.ac
index 179bec4..19cbfcd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -343,16 +343,24 @@ if test "x$bitforce$modminer" != xnono; then
fi
AM_CONDITIONAL([HAVE_LIBUDEV], [test x$libudev != xno])
+PKG_PROG_PKG_CONFIG()
+
if test "x$ztex" != xno; then
- AC_CHECK_LIB(usb-1.0, libusb_init, ,
- AC_MSG_ERROR([Could not find usb library - please install libusb]))
- AC_DEFINE([HAVE_LIBUSB], [1], [Defined to 1 if libusb is wanted])
- USB_LIBS="-lusb-1.0"
- USB_FLAGS=""
+ case $target in
+ *-*-mingw*)
+ # workaround for libusbx windows binaries not including a .pc file
+ LIBUSB_LIBS="-LC:/MinGW/lib -lusb-1.0"
+ LIBUSB_CFLAGS="-IC:/MinGW/include/libusb-1.0"
+ AC_DEFINE(HAVE_LIBUSB, 1, [Define if you have libusb-1.0])
+ ;;
+ *)
+ PKG_CHECK_MODULES(LIBUSB, libusb-1.0, [AC_DEFINE(HAVE_LIBUSB, 1, [Define if you have libusb-1.0])], [AC_MSG_ERROR([Could not find usb library - please install libusb-1.0])])
+ ;;
+ esac
+ USB_LIBS="$LIBUSB_LIBS"
+ USB_FLAGS="$LIBUSB_CFLAGS"
fi
-PKG_PROG_PKG_CONFIG()
-
PKG_CHECK_MODULES([LIBCURL], [libcurl >= 7.18.2], ,[AC_MSG_ERROR([Missing required libcurl dev >= 7.18.2])])
AC_SUBST(LIBCURL_LIBS)
diff --git a/libztex.h b/libztex.h
index d424545..4b5dab3 100644
--- a/libztex.h
+++ b/libztex.h
@@ -22,7 +22,7 @@
#ifndef __LIBZTEX_H__
#define __LIBZTEX_H__
-#include <libusb-1.0/libusb.h>
+#include <libusb.h>
#define LIBZTEX_MAX_DESCRIPTORS 512
#define LIBZTEX_SNSTRING_LEN 10
diff --git a/miner.h b/miner.h
index 7d261c5..f098e23 100644
--- a/miner.h
+++ b/miner.h
@@ -103,7 +103,7 @@ static inline int fsync (int fd)
#endif
#ifdef HAVE_LIBUSB
- #include <libusb-1.0/libusb.h>
+ #include <libusb.h>
#endif
#ifdef USE_ZTEX