mirror of
https://github.com/GOSTSec/sgminer
synced 2025-01-27 23:14:21 +00:00
Revert "Find libusb-1.0 using pkg-config and correct the libusb.h #include path"
This reverts commit 171c3d0c72e749bc9d82a6742955119decf7b09c. Rollback breakage.
This commit is contained in:
parent
2696738633
commit
e55ef04df6
12
configure.ac
12
configure.ac
@ -343,14 +343,16 @@ 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
|
||||
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])])
|
||||
USB_LIBS="$LIBUSB_LIBS"
|
||||
USB_FLAGS="$LIBUSB_CFLAGS"
|
||||
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=""
|
||||
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)
|
||||
|
||||
|
@ -22,7 +22,7 @@
|
||||
#ifndef __LIBZTEX_H__
|
||||
#define __LIBZTEX_H__
|
||||
|
||||
#include <libusb.h>
|
||||
#include <libusb-1.0/libusb.h>
|
||||
|
||||
#define LIBZTEX_MAX_DESCRIPTORS 512
|
||||
#define LIBZTEX_SNSTRING_LEN 10
|
||||
|
Loading…
x
Reference in New Issue
Block a user