Commit b58d1b375e2faa331b3085d10e91ace825b10472
2013-11-10T20:14:56
Reorder configure alphabetically for devices to compile and fail if no support is selected to be compiled in.
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 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123
diff --git a/configure.ac b/configure.ac
index 02735e8..59df5bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,16 +137,16 @@ if test "x$avalon" = xyes; then
fi
AM_CONDITIONAL([HAS_AVALON], [test x$avalon = xyes])
-knc="no"
+bab="no"
-AC_ARG_ENABLE([knc],
- [AC_HELP_STRING([--enable-knc],[Compile support for KnC miners (default disabled)])],
- [knc=$enableval]
+AC_ARG_ENABLE([bab],
+ [AC_HELP_STRING([--enable-bab],[Compile support for BlackArrow Bitfury (default disabled)])],
+ [bab=$enableval]
)
-if test "x$knc" = xyes; then
- AC_DEFINE([USE_KNC], [1], [Defined to 1 if KnC miner support is wanted])
+if test "x$bab" = xyes; then
+ AC_DEFINE([USE_BAB], [1], [Defined to 1 if BlackArrow Bitfury support is wanted])
fi
-AM_CONDITIONAL([HAS_KNC], [test x$knc = xyes])
+AM_CONDITIONAL([HAS_BAB], [test x$bab = xyes])
bflsc="no"
@@ -192,17 +192,6 @@ if test "x$hashfast" = xyes; then
fi
AM_CONDITIONAL([HAS_HASHFAST], [test x$hashfast = xyes])
-bab="no"
-
-AC_ARG_ENABLE([bab],
- [AC_HELP_STRING([--enable-bab],[Compile support for BlackArrow Bitfury (default disabled)])],
- [bab=$enableval]
- )
-if test "x$bab" = xyes; then
- AC_DEFINE([USE_BAB], [1], [Defined to 1 if BlackArrow Bitfury support is wanted])
-fi
-AM_CONDITIONAL([HAS_BAB], [test x$bab = xyes])
-
icarus="no"
AC_ARG_ENABLE([icarus],
@@ -225,6 +214,17 @@ if test "x$klondike" = xyes; then
fi
AM_CONDITIONAL([HAS_KLONDIKE], [test x$klondike = xyes])
+knc="no"
+
+AC_ARG_ENABLE([knc],
+ [AC_HELP_STRING([--enable-knc],[Compile support for KnC miners (default disabled)])],
+ [knc=$enableval]
+ )
+if test "x$knc" = xyes; then
+ AC_DEFINE([USE_KNC], [1], [Defined to 1 if KnC miner support is wanted])
+fi
+AM_CONDITIONAL([HAS_KNC], [test x$knc = xyes])
+
modminer="no"
AC_ARG_ENABLE([modminer],
@@ -447,16 +447,16 @@ else
echo " Avalon.ASICs.........: Disabled"
fi
-if test "x$bflsc" = xyes; then
- echo " BFL.ASICs............: Enabled"
+if test "x$bab" = xyes; then
+ echo " BlackArrow.ASICs.....: Enabled"
else
- echo " BFL.ASICs............: Disabled"
+ echo " BlackArrow.ASICs.....: Disabled"
fi
-if test "x$knc" = xyes; then
- echo " KnC.ASICs............: Enabled"
+if test "x$bflsc" = xyes; then
+ echo " BFL.ASICs............: Enabled"
else
- echo " KnC.ASICs............: Disabled"
+ echo " BFL.ASICs............: Disabled"
fi
if test "x$bitforce" = xyes; then
@@ -477,12 +477,6 @@ else
echo " Hashfast.ASICs.......: Disabled"
fi
-if test "x$bab" = xyes; then
- echo " BlackArrow.ASICs.....: Enabled"
-else
- echo " BlackArrow.ASICs.....: Disabled"
-fi
-
if test "x$icarus" = xyes; then
echo " Icarus.ASICs/FPGAs...: Enabled"
else
@@ -495,12 +489,22 @@ else
echo " Klondike.ASICs.......: Disabled"
fi
+if test "x$knc" = xyes; then
+ echo " KnC.ASICs............: Enabled"
+else
+ echo " KnC.ASICs............: Disabled"
+fi
+
if test "x$modminer" = xyes; then
echo " ModMiner.FPGAs.......: Enabled"
else
echo " ModMiner.FPGAs.......: Disabled"
fi
+if test "x$avalon$bab$bflsc$bitforce$bitfury$hashfast$icarus$klondike$knc$modminer" = xnononononononononono; then
+ AC_MSG_ERROR([No mining configured in])
+fi
+
echo
echo "Compilation............: make (or gmake)"
echo " CPPFLAGS.............: $CPPFLAGS"