Merge pull request #334 from denis2342/pkgconfig third of version of pkg-config changes
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 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121
diff --git a/Makefile.am b/Makefile.am
index 85dd170..83566c6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@ EXTRA_DIST = example.conf m4/gnulib-cache.m4 linux-usb-cgminer \
SUBDIRS = lib compat ccan
-INCLUDES = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES) $(USB_FLAGS)
+INCLUDES = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES)
bin_PROGRAMS = cgminer
@@ -24,13 +24,13 @@ bin_SCRIPTS = *.cl
cgminer_LDFLAGS = $(PTHREAD_FLAGS)
cgminer_LDADD = $(DLOPEN_FLAGS) @LIBCURL_LIBS@ @JANSSON_LIBS@ @PTHREAD_LIBS@ \
@OPENCL_LIBS@ @NCURSES_LIBS@ @PDCURSES_LIBS@ @WS2_LIBS@ \
- @UDEV_LIBS@ @USB_LIBS@ \
+ @UDEV_LIBS@ @LIBUSB_LIBS@ \
@MATH_LIBS@ lib/libgnu.a ccan/libccan.a
if HAVE_WINDOWS
-cgminer_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib @OPENCL_FLAGS@
+cgminer_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib @OPENCL_FLAGS@ @LIBUSB_CFLAGS@
else
-cgminer_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib @OPENCL_FLAGS@ @LIBCURL_CFLAGS@
+cgminer_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib @OPENCL_FLAGS@ @LIBUSB_CFLAGS@ @LIBCURL_CFLAGS@
endif
# common sources
diff --git a/configure.ac b/configure.ac
index 92a90cb..17fda02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,8 +62,6 @@ AC_FUNC_ALLOCA
have_win32=false
PTHREAD_FLAGS="-lpthread"
-USB_LIBS=""
-USB_FLAGS=""
DLOPEN_FLAGS="-ldl"
OPENCL_LIBS="-lOpenCL"
WS2_LIBS=""
@@ -343,15 +341,22 @@ 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
+ *-*-freebsd*)
+ LIBUSB_LIBS="-lusb"
+ LIBUSB_CFLAGS=""
+ 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
fi
-
-PKG_PROG_PKG_CONFIG()
+AC_SUBST(LIBUSB_LIBS)
+AC_SUBST(LIBUSB_CFLAGS)
PKG_CHECK_MODULES([LIBCURL], [libcurl >= 7.18.2], ,[AC_MSG_ERROR([Missing required libcurl dev >= 7.18.2])])
AC_SUBST(LIBCURL_LIBS)
@@ -412,8 +417,6 @@ AC_SUBST(PDCURSES_LIBS)
AC_SUBST(WS2_LIBS)
AC_SUBST(MATH_LIBS)
AC_SUBST(UDEV_LIBS)
-AC_SUBST(USB_LIBS)
-AC_SUBST(USB_FLAGS)
AC_CONFIG_FILES([
Makefile
@@ -512,9 +515,9 @@ fi
echo
echo "Compilation............: make (or gmake)"
echo " CPPFLAGS.............: $CPPFLAGS"
-echo " CFLAGS...............: $CFLAGS"
-echo " LDFLAGS..............: $LDFLAGS $PTHREAD_FLAGS $USB_FLAGS"
-echo " LDADD................: $DLOPEN_FLAGS $LIBCURL_LIBS $JANSSON_LIBS $PTHREAD_LIBS $OPENCL_LIBS $NCURSES_LIBS $PDCURSES_LIBS $WS2_LIBS $MATH_LIBS $UDEV_LIBS $USB_LIBS"
+echo " CFLAGS...............: $CFLAGS $LIBUSB_CFLAGS"
+echo " LDFLAGS..............: $LDFLAGS $PTHREAD_FLAGS"
+echo " LDADD................: $DLOPEN_FLAGS $LIBCURL_LIBS $JANSSON_LIBS $PTHREAD_LIBS $OPENCL_LIBS $NCURSES_LIBS $PDCURSES_LIBS $WS2_LIBS $MATH_LIBS $UDEV_LIBS $LIBUSB_LIBS"
echo
echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')"
echo " prefix...............: $prefix"
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 865c58a..820ef63 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