Merge commit 'dde870d' into bfgminer

configure.ac

@@ -1168,7 +1168,6 @@ AC_CONFIG_FILES([
 	ccan/Makefile
 	lib/Makefile
 	])
-AC_OUTPUT
 
 
 echo
@@ -1206,6 +1205,7 @@ EOF
 	done
 	_yeslist=`echo "$_yeslist" | tr ' ' '\n' | sort | tr '\n' ' '`
 	_nolist=`echo "$_nolist" | tr ' ' '\n' | sort | tr '\n' ' '`
+	AC_DEFINE_UNQUOTED(AS_TR_CPP([BFG_$2]),["$_yeslist"],[List of drivers being built])
 	echo "  Enabled..$1..:$_yeslist"
 	echo "  Disabled.$1..:$_nolist"
 	if test -n "$_enableactions"; then
@@ -1226,3 +1226,4 @@ echo "Installation...........: make install$maybe_ldconfig #(as root if needed,
 echo "  prefix...............: $prefix"
 echo
 
+AC_OUTPUT

miner.c

@@ -2167,57 +2167,10 @@ extern const char *opt_argv0;
 
 static char *opt_verusage_and_exit(const char *extra)
 {
-	printf("%s\nBuilt with "
-#ifdef USE_AVALON
-		"avalon "
-#endif
-#ifdef USE_BFSB
-		"bfsb "
-#endif
-#ifdef USE_BIGPIC
-		"bigpic "
-#endif
-#ifdef USE_BITFORCE
-		"bitforce "
-#endif
-#ifdef USE_BITFURY
-		"bitfury "
-#endif
-#ifdef WANT_CPUMINE
-		"CPU "
-#endif
-#ifdef HAVE_OPENCL
-		"GPU "
-#endif
-#ifdef USE_ICARUS
-		"icarus "
-#endif
-#ifdef USE_LITTLEFURY
-		"littlefury "
-#endif
-#ifdef USE_METABANK
-		"metabank "
-#endif
-#ifdef USE_MODMINER
-		"modminer "
-#endif
-#ifdef USE_SCRYPT
-		"scrypt "
-#endif
-#ifdef USE_LIBMICROHTTPD
-		"SGW "
-#endif
-#ifdef USE_LIBEVENT
-		"SSM "
-#endif
-#ifdef USE_X6500
-		"x6500 "
-#endif
-#ifdef USE_ZTEX
-		"ztex "
-#endif
-		"mining support.\n"
-		, packagename);
+	puts(packagename);
+	printf("  Drivers:%s\n", BFG_DRIVERLIST);
+	printf("  Algoritms:%s\n", BFG_ALGOLIST);
+	printf("  Options:%s\n", BFG_OPTLIST);
 	printf("%s", opt_usage(opt_argv0, extra));
 	fflush(stdout);
 	exit(0);