projects / packages / cgminer-gpu.git / blame
| Commit | Line | Data |
|---|---|---|
| e7bb96eb JK |
1 | diff -dur cgminer-3.8.3.orig/Makefile.am cgminer-3.8.3/Makefile.am |
| 2 | --- cgminer-3.8.3.orig/Makefile.am 2013-11-22 13:52:57.000000000 +0100 | |
| 3 | +++ cgminer-3.8.3/Makefile.am 2014-01-07 10:36:06.000000000 +0100 | |
| 4 | @@ -1,8 +1,6 @@ | |
| 5 | ||
| 6 | ACLOCAL_AMFLAGS = -I m4 | |
| 7 | ||
| 8 | -JANSSON_INCLUDES= -I$(top_builddir)/compat/jansson-2.5/src -I$(top_srcdir)/compat/jansson-2.5/src | |
| 9 | - | |
| 10 | if WANT_USBUTILS | |
| 11 | USBUTILS_INCLUDES = -I$(top_builddir)/compat/libusb-1.0/libusb -I$(top_srcdir)/compat/libusb-1.0/libusb | |
| 12 | else | |
| 13 | @@ -18,7 +16,7 @@ | |
| 14 | ||
| 15 | SUBDIRS = lib compat ccan | |
| 16 | ||
| 17 | -INCLUDES = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES) $(USBUTILS_INCLUDES) | |
| 18 | +INCLUDES = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_CFLAGS) $(USBUTILS_INCLUDES) | |
| 19 | ||
| 20 | bin_PROGRAMS = cgminer | |
| 21 | ||
| 22 | diff -dur cgminer-3.8.3.orig/compat/Makefile.am cgminer-3.8.3/compat/Makefile.am | |
| 23 | --- cgminer-3.8.3.orig/compat/Makefile.am 2013-11-17 23:13:00.000000000 +0100 | |
| 24 | +++ cgminer-3.8.3/compat/Makefile.am 2014-01-07 10:36:15.000000000 +0100 | |
| 25 | @@ -1,5 +1,5 @@ | |
| 26 | ||
| 27 | -SUBDIRS = jansson-2.5 | |
| 28 | +SUBDIRS = | |
| 29 | ||
| 30 | if WANT_USBUTILS | |
| 31 | if WANT_STATIC_LIBUSB | |
| 32 | Only in cgminer-3.8.3/compat: Makefile.am~ | |
| 33 | diff -dur cgminer-3.8.3.orig/configure.ac cgminer-3.8.3/configure.ac | |
| 34 | --- cgminer-3.8.3.orig/configure.ac 2013-11-23 00:32:53.000000000 +0100 | |
| 35 | +++ cgminer-3.8.3/configure.ac 2014-01-07 10:36:06.000000000 +0100 | |
| 36 | @@ -308,9 +308,6 @@ | |
| 37 | ||
| 38 | AM_CONDITIONAL([WANT_STATIC_LIBUSB], [test x$dlibusb = xno]) | |
| 39 | ||
| 40 | -AC_CONFIG_SUBDIRS([compat/jansson-2.5]) | |
| 41 | -JANSSON_LIBS="compat/jansson-2.5/src/.libs/libjansson.a" | |
| 42 | - | |
| 43 | PKG_PROG_PKG_CONFIG() | |
| 44 | ||
| 45 | if test "x$have_cgminer_sdk" = "xtrue"; then | |
| 46 | @@ -331,6 +328,8 @@ | |
| 47 | [libcurl=$enableval] | |
| 48 | ) | |
| 49 | ||
| 50 | +PKG_CHECK_MODULES([JANSSON], [jansson >= 2.5]) | |
| 51 | + | |
| 52 | if test "x$libcurl" != xno; then | |
| 53 | if test "x$have_win32" != xtrue; then | |
| 54 | PKG_CHECK_MODULES([LIBCURL], [libcurl >= 7.25.0], [AC_DEFINE([CURL_HAS_KEEPALIVE], [1], [Defined if version of curl supports keepalive.])], | |
| 55 | @@ -400,6 +399,7 @@ | |
| 56 | ||
| 57 | ||
| 58 | AC_SUBST(JANSSON_LIBS) | |
| 59 | +AC_SUBST(JANSSON_CFLAGS) | |
| 60 | AC_SUBST(PTHREAD_FLAGS) | |
| 61 | AC_SUBST(DLOPEN_FLAGS) | |
| 62 | AC_SUBST(PTHREAD_LIBS) |