Merge branch 'cfg_fpga_def' into bfgminer

Conflicts:
	README

README

@@ -61,12 +61,12 @@ Dependencies:
 
 BFGMiner specific configuration options:
 	--enable-cpumining      Build with cpu mining support(default disabled)
-	--disable-opencl        Override detection and disable building with opencl
+	--disable-opencl        Build without support for OpenCL (default enabled)
 	--disable-adl           Override detection and disable building with adl
-	--enable-bitforce       Compile support for BitForce FPGAs(default disabled)
-	--enable-icarus         Compile support for Icarus Board(default disabled)
-	--enable-modminer       Compile support for ModMiner FPGAs(default disabled)
-	--enable-ztex           Compile support for Ztex Board(default disabled)
+	--disable-bitforce      Compile support for BitForce (default enabled)
+	--disable-icarus        Compile support for Icarus (default enabled)
+	--disable-modminer      Compile support for ModMiner (default enabled)
+	--disable-ztex          Compile support for Ztex (default if libusb)
 	--enable-scrypt         Compile support for scrypt litecoin mining (default disabled)
 	--without-curses        Compile support for curses TUI (default enabled)
 	--without-libudev       Autodetect FPGAs using libudev (default enabled)

configure.ac

@@ -174,7 +174,7 @@ fi
 AM_CONDITIONAL([HAS_ICARUS], [test x$icarus = xyes])
 
 AC_ARG_ENABLE([modminer],
-	[AC_HELP_STRING([--enable-modminer],[Compile support for ModMiner (default enabled)])],
+	[AC_HELP_STRING([--disable-modminer],[Compile support for ModMiner (default enabled)])],
 	[modminer=$enableval],
 	[modminer=yes]
 	)