Merge branch 'httpsrv' into bfgminer

openwrt/bfgminer/Makefile

@@ -38,7 +38,7 @@ endef
 define Package/$(PKG_NAME)
 $(call Package/$(PKG_NAME)/Default)
 	TITLE:=$(PKG_TITLE) (Bitcoin miner)
-	DEPENDS:=+libc +libcurl +libpthread +jansson +PACKAGE_$(PKG_NAME)_curses:libncurses +PACKAGE_$(PKG_NAME)_libusb:libusb-1.0
+	DEPENDS:=+libc +libcurl +libpthread +jansson +PACKAGE_$(PKG_NAME)_curses:libncurses +PACKAGE_$(PKG_NAME)_libmicrohttpd:libmicrohttpd +PACKAGE_$(PKG_NAME)_libusb:libusb-1.0
 endef
 
 define Package/$(PKG_NAME)/description
@@ -50,6 +50,10 @@ config PACKAGE_$(PKG_NAME)_curses
 	bool "Build with curses TUI support"
 	depends on PACKAGE_$(PKG_NAME)
 	default y
+config PACKAGE_$(PKG_NAME)_libmicrohttpd
+	bool "Build with getwork server support (Block Erupter blades)"
+	depends on PACKAGE_$(PKG_NAME)
+	default y
 config PACKAGE_$(PKG_NAME)_libusb
 	bool "Build with libusb support (X6500 & ZTEX)"
 	depends on PACKAGE_$(PKG_NAME)
@@ -62,6 +66,12 @@ else
 CONFIGURE_ARGS += --with-curses=ncurses
 endif
 
+ifndef CONFIG_PACKAGE_$(PKG_NAME)_libmicrohttpd
+CONFIGURE_ARGS += --without-libmicrohttpd
+else
+CONFIGURE_ARGS += --with-libmicrohttpd
+endif
+
 ifndef CONFIG_PACKAGE_$(PKG_NAME)_libusb
 CONFIGURE_ARGS += --disable-x6500 --disable-ztex
 endif