Commit 2f72efb0a03c1b0956b4a4b8296b5614a2aeb828
2013-09-19T09:20:56
Add configuration option for hashfast devices, tidying up configure.ac slightly.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103
diff --git a/configure.ac b/configure.ac
index a2f8b1b..0e05cdf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,6 +220,17 @@ fi
AM_CONDITIONAL([HAS_SCRYPT], [test x$scrypt = xyes])
+avalon="no"
+
+AC_ARG_ENABLE([avalon],
+ [AC_HELP_STRING([--enable-avalon],[Compile support for Avalon (default disabled)])],
+ [avalon=$enableval]
+ )
+if test "x$avalon" = xyes; then
+ AC_DEFINE([USE_AVALON], [1], [Defined to 1 if Avalon support is wanted])
+fi
+AM_CONDITIONAL([HAS_AVALON], [test x$avalon = xyes])
+
bflsc="no"
AC_ARG_ENABLE([bflsc],
@@ -242,6 +253,17 @@ if test "x$bitforce" = xyes; then
fi
AM_CONDITIONAL([HAS_BITFORCE], [test x$bitforce = xyes])
+hashfast="no"
+
+AC_ARG_ENABLE([hashfast],
+ [AC_HELP_STRING([--enable-hashfast],[Compile support for Hashfast (default disabled)])],
+ [hashfast=$enableval]
+ )
+if test "x$hashfast" = xyes; then
+ AC_DEFINE([USE_HASHFAST], [1], [Defined to 1 if Hashfast support is wanted])
+fi
+AM_CONDITIONAL([HAS_HASHFAST], [test x$hashfast = xyes])
+
icarus="no"
AC_ARG_ENABLE([icarus],
@@ -253,17 +275,6 @@ if test "x$icarus" = xyes; then
fi
AM_CONDITIONAL([HAS_ICARUS], [test x$icarus = xyes])
-avalon="no"
-
-AC_ARG_ENABLE([avalon],
- [AC_HELP_STRING([--enable-avalon],[Compile support for Avalon (default disabled)])],
- [avalon=$enableval]
- )
-if test "x$avalon" = xyes; then
- AC_DEFINE([USE_AVALON], [1], [Defined to 1 if Avalon support is wanted])
-fi
-AM_CONDITIONAL([HAS_AVALON], [test x$avalon = xyes])
-
modminer="no"
AC_ARG_ENABLE([modminer],
@@ -310,7 +321,7 @@ else
])
fi
-if test x$avalon$bitforce$modminer$bflsc$icarus != xnonononono; then
+if test x$avalon$bitforce$modminer$bflsc$icarus$hashfast != xnononononono; then
want_usbutils=true
else
want_usbutils=false
@@ -464,14 +475,14 @@ if test "x$opencl" != xno; then
else
echo " OpenCL...............: NOT FOUND. GPU mining support DISABLED"
- if test "x$bitforce$avalon$icarus$ztex$modminer$bflsc" = xnononononono; then
+ if test "x$bitforce$avalon$icarus$ztex$modminer$bflsc$hashfast" = xnonononononono; then
AC_MSG_ERROR([No mining configured in])
fi
echo " scrypt...............: Disabled (needs OpenCL)"
fi
else
echo " OpenCL...............: Detection overrided. GPU mining support DISABLED"
- if test "x$bitforce$icarus$avalon$ztex$modminer$bflsc" = xnononononono; then
+ if test "x$bitforce$icarus$avalon$ztex$modminer$bflsc$hashfast" = xnonononononono; then
AC_MSG_ERROR([No mining configured in])
fi
echo " scrypt...............: Disabled (needs OpenCL)"
@@ -506,10 +517,16 @@ else
echo " BitForce.FPGAs.......: Disabled"
fi
+if test "x$hashfast" = xyes; then
+ echo " Hashfast.ASICs.......: Enabled"
+else
+ echo " Hashfast.ASICs.......: Disabled"
+fi
+
if test "x$icarus" = xyes; then
- echo " Icarus.FPGAs.........: Enabled"
+ echo " Icarus.ASICs/FPGAs...: Enabled"
else
- echo " Icarus.FPGAs.........: Disabled"
+ echo " Icarus.ASICs/FPGAs...: Disabled"
fi
if test "x$modminer" = xyes; then