Merge commit 'ec35720' into bfgminer

Conflicts:
	README

README

@@ -128,6 +128,7 @@ BFGMiner specific configuration options:
 	--enable-scrypt         Compile support for scrypt mining (default disabled)
 	--with-system-libblkmaker  Use system libblkmaker rather than bundled one
 	                           (default disabled)
+	--without-sensors       Build with libsensors monitoring (default enabled)
 	--without-curses        Compile support for curses TUI (default enabled)
 	--without-libudev       Autodetect FPGAs using libudev (default enabled)
 

configure.ac

@@ -256,7 +256,9 @@ AC_SUBST(JANSSON_LIBS)
 if test "x$opencl" = xyes; then
 	adl="yes"
 	
-AC_ARG_WITH([sensors],[Build with libsensors monitoring],[true],[with_sensors=auto])
+AC_ARG_WITH([sensors],
+	[AC_HELP_STRING([--without-sensors],[Build with libsensors monitoring (default enabled)])],
+	[true],[with_sensors=auto])
 if test "x$opencl" != xyes; then
 	with_sensors=no
 fi