Browse Source

Merge branch 'stratumsrv' into bfgminer

Luke Dashjr 12 years ago
parent
commit
dfe31c7dae
3 changed files with 8 additions and 4 deletions
  1. 4 1
      README
  2. 3 3
      configure.ac
  3. 1 0
      make-release

+ 4 - 1
README

@@ -81,7 +81,7 @@ BUILDING BFGMINER
 Everything you probably want, condensed:
 Everything you probably want, condensed:
 	build-essential autoconf automake libtool pkg-config libcurl4-gnutls-dev
 	build-essential autoconf automake libtool pkg-config libcurl4-gnutls-dev
 	libjansson-dev uthash-dev libncursesw5-dev libudev-dev libusb-1.0-0-dev
 	libjansson-dev uthash-dev libncursesw5-dev libudev-dev libusb-1.0-0-dev
-	libmicrohttpd-dev
+	libevent-dev libmicrohttpd-dev
 
 
 Dependencies:
 Dependencies:
 	autoconf             http://www.gnu.org/software/autoconf/
 	autoconf             http://www.gnu.org/software/autoconf/
@@ -108,6 +108,9 @@ Optional Dependencies:
 	
 	
 	getwork server for Block Erupter Blades:
 	getwork server for Block Erupter Blades:
 	  libmicrohttpd-dev 0.9.5+  http://www.gnu.org/software/libmicrohttpd/
 	  libmicrohttpd-dev 0.9.5+  http://www.gnu.org/software/libmicrohttpd/
+	
+	Stratum proxy:
+	  libevent 2.0.3+    http://libevent.org/
 
 
 	X6500 and ZTEX FPGA boards:
 	X6500 and ZTEX FPGA boards:
 	  libusb-1.0-0-dev   http://www.libusb.org/
 	  libusb-1.0-0-dev   http://www.libusb.org/

+ 3 - 3
configure.ac

@@ -364,14 +364,14 @@ AC_ARG_WITH([libevent],
 	[libevent=$withval]
 	[libevent=$withval]
 )
 )
 if test "x$libevent" != "xno"; then
 if test "x$libevent" != "xno"; then
-	PKG_CHECK_MODULES([libevent],[libevent >= 2],[
+	PKG_CHECK_MODULES([libevent],[libevent >= 2.0.3],[
 		AC_DEFINE([USE_LIBEVENT],[1],[Defined to 1 if libevent support is wanted])
 		AC_DEFINE([USE_LIBEVENT],[1],[Defined to 1 if libevent support is wanted])
 		libevent=yes
 		libevent=yes
 	],[
 	],[
 		if test "x$libevent" = "xyes"; then
 		if test "x$libevent" = "xyes"; then
-			AC_MSG_ERROR([Unable to find libevent 2])
+			AC_MSG_ERROR([Unable to find libevent 2.0.3+])
 		else
 		else
-			AC_MSG_WARN([libevent 2 not found; stratum proxy will be unavailable])
+			AC_MSG_WARN([libevent 2.0.3+ not found; stratum proxy will be unavailable])
 		fi
 		fi
 	])
 	])
 fi
 fi

+ 1 - 0
make-release

@@ -56,6 +56,7 @@ dlls='
 	backtrace.dll
 	backtrace.dll
 	pdcurses.dll
 	pdcurses.dll
 	libcurl-4.dll
 	libcurl-4.dll
+	libevent-2-0-5.dll
 	pthreadGC2.dll
 	pthreadGC2.dll
 	libjansson-4.dll
 	libjansson-4.dll
 	libusb-1.0.dll
 	libusb-1.0.dll