Browse Source

Unconditionally build jansson statically from the cgminer source tree.

Con Kolivas 12 years ago
parent
commit
7f653ba97c
3 changed files with 2 additions and 18 deletions
  1. 0 4
      Makefile.am
  2. 1 5
      compat/Makefile.am
  3. 1 9
      configure.ac

+ 0 - 4
Makefile.am

@@ -1,11 +1,7 @@
 
 
 ACLOCAL_AMFLAGS = -I m4
 ACLOCAL_AMFLAGS = -I m4
 
 
-if WANT_JANSSON
 JANSSON_INCLUDES= -I$(top_srcdir)/compat/jansson
 JANSSON_INCLUDES= -I$(top_srcdir)/compat/jansson
-else
-JANSSON_INCLUDES=
-endif
 
 
 if WANT_USBUTILS
 if WANT_USBUTILS
 USBUTILS_INCLUDES = -I$(top_srcdir)/compat/libusb-1.0/libusb
 USBUTILS_INCLUDES = -I$(top_srcdir)/compat/libusb-1.0/libusb

+ 1 - 5
compat/Makefile.am

@@ -1,9 +1,5 @@
 
 
-SUBDIRS	=
-
-if WANT_JANSSON
-SUBDIRS	+= jansson
-endif
+SUBDIRS	= jansson
 
 
 if WANT_USBUTILS
 if WANT_USBUTILS
 SUBDIRS += libusb-1.0
 SUBDIRS += libusb-1.0

+ 1 - 9
configure.ac

@@ -183,8 +183,6 @@ if test "x$has_winpthread" != xtrue; then
         PTHREAD_LIBS=-lpthread
         PTHREAD_LIBS=-lpthread
 fi
 fi
 
 
-AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)
-
 AC_ARG_ENABLE([adl],
 AC_ARG_ENABLE([adl],
 	[AC_HELP_STRING([--disable-adl],[Override detection and disable building with adl])],
 	[AC_HELP_STRING([--disable-adl],[Override detection and disable building with adl])],
 	[adl=$enableval]
 	[adl=$enableval]
@@ -319,7 +317,6 @@ fi
 AM_CONDITIONAL([NEED_FPGAUTILS], [test x$modminer$ztex != xnono])
 AM_CONDITIONAL([NEED_FPGAUTILS], [test x$modminer$ztex != xnono])
 AM_CONDITIONAL([WANT_USBUTILS], [test x$want_usbutils != xfalse])
 AM_CONDITIONAL([WANT_USBUTILS], [test x$want_usbutils != xfalse])
 AM_CONDITIONAL([HAVE_CURSES], [test x$curses = xyes])
 AM_CONDITIONAL([HAVE_CURSES], [test x$curses = xyes])
-AM_CONDITIONAL([WANT_JANSSON], [test x$request_jansson = xtrue])
 AM_CONDITIONAL([HAVE_WINDOWS], [test x$have_win32 = xtrue])
 AM_CONDITIONAL([HAVE_WINDOWS], [test x$have_win32 = xtrue])
 AM_CONDITIONAL([HAVE_x86_64], [test x$have_x86_64 = xtrue])
 AM_CONDITIONAL([HAVE_x86_64], [test x$have_x86_64 = xtrue])
 
 
@@ -334,12 +331,7 @@ else
 	LIBUSB_LIBS=""
 	LIBUSB_LIBS=""
 fi
 fi
 
 
-if test x$request_jansson = xtrue
-then
-	JANSSON_LIBS="compat/jansson/libjansson.a"
-else
-	JANSSON_LIBS=-ljansson
-fi
+JANSSON_LIBS="compat/jansson/libjansson.a"
 
 
 PKG_PROG_PKG_CONFIG()
 PKG_PROG_PKG_CONFIG()