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
6 ACLOCAL_AMFLAGS = -I m4
8 -JANSSON_INCLUDES= -I$(top_builddir)/compat/jansson-2.5/src -I$(top_srcdir)/compat/jansson-2.5/src
11 USBUTILS_INCLUDES = -I$(top_builddir)/compat/libusb-1.0/libusb -I$(top_srcdir)/compat/libusb-1.0/libusb
15 SUBDIRS = lib compat ccan
17 -INCLUDES = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES) $(USBUTILS_INCLUDES)
18 +INCLUDES = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_CFLAGS) $(USBUTILS_INCLUDES)
20 bin_PROGRAMS = cgminer
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
27 -SUBDIRS = jansson-2.5
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
38 AM_CONDITIONAL([WANT_STATIC_LIBUSB], [test x$dlibusb = xno])
40 -AC_CONFIG_SUBDIRS([compat/jansson-2.5])
41 -JANSSON_LIBS="compat/jansson-2.5/src/.libs/libjansson.a"
45 if test "x$have_cgminer_sdk" = "xtrue"; then
50 +PKG_CHECK_MODULES([JANSSON], [jansson >= 2.5])
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.])],
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)