Skip to content

Instantly share code, notes, and snippets.

@miry
Created June 30, 2011 19:17
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save miry/1056980 to your computer and use it in GitHub Desktop.
Save miry/1056980 to your computer and use it in GitHub Desktop.
Patch to fix issue in cpuminer
From 6cbc591a18d322e40994b50c8bb8161de4f38ca9 Mon Sep 17 00:00:00 2001
From: Michael Nikitochkin <miry.sof@gmail.com>
Date: Sat, 18 Jun 2011 17:48:50 +0300
Subject: [PATCH 166/166] fix includin jansson lib
---
Makefile.am | 8 ++++----
compat/Makefile.am | 8 ++++----
configure.ac | 14 +++++++-------
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 9556882..a62d6b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,9 @@
-if WANT_JANSSON
+#if WANT_JANSSON
JANSSON_INCLUDES= -I$(top_srcdir)/compat/jansson
-else
-JANSSON_INCLUDES=
-endif
+#else
+#JANSSON_INCLUDES=
+#endif
EXTRA_DIST = example-cfg.json
diff --git a/compat/Makefile.am b/compat/Makefile.am
index 77af3c5..ef0d21d 100644
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -1,7 +1,7 @@
-if WANT_JANSSON
+#if WANT_JANSSON
SUBDIRS = jansson
-else
-SUBDIRS =
-endif
+#else
+#SUBDIRS =
+#endif
diff --git a/configure.ac b/configure.ac
index 1747aef..670e950 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,19 +40,19 @@ case $target in
esac
-AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)
+#AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)
AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIBS=-lpthread)
-AM_CONDITIONAL([WANT_JANSSON], [test x$request_jansson = xtrue])
+#AM_CONDITIONAL([WANT_JANSSON], [test x$request_jansson = xtrue])
AM_CONDITIONAL([HAVE_WINDOWS], [test x$have_win32 = xtrue])
AM_CONDITIONAL([HAVE_x86_64], [test x$have_x86_64 = xtrue])
-if test x$request_jansson = xtrue
-then
+#if test x$request_jansson = xtrue
+#then
JANSSON_LIBS="compat/jansson/libjansson.a"
-else
- JANSSON_LIBS=-ljansson
-fi
+#else
+# JANSSON_LIBS=-ljansson
+#fi
dnl Find YASM
has_yasm=false
--
1.7.5.4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment