Browse Source

configure: Update bigpic driver dependency on bitfury code

Luke Dashjr 12 years ago
parent
commit
af8772b155
1 changed files with 21 additions and 12 deletions
  1. 21 12
      configure.ac

+ 21 - 12
configure.ac

@@ -302,18 +302,6 @@ else
 	adl="no"
 fi
 
-################################################################################
-AC_ARG_ENABLE([bigpic],
-	[AC_HELP_STRING([--disable-bigpic],[Compile support for Big Picture Mining USB (default enabled)])],
-	[bigpic=$enableval],
-	[bigpic=yes]
-	)
-if test "x$bigpic" = xyes; then
-	AC_DEFINE([USE_BIGPIC], [1], [Defined to 1 if Big Picture Mining USB support is wanted])
-	need_fpgautils=yes
-fi
-AM_CONDITIONAL([HAS_BIGPIC], [test x$bigpic = xyes])
-
 AC_ARG_ENABLE([bitforce],
 	[AC_HELP_STRING([--disable-bitforce],[Compile support for BitForce (default enabled)])],
 	[bitforce=$enableval],
@@ -480,6 +468,27 @@ fi
 AM_CONDITIONAL([HAS_BFSB], [test x$bfsb = xyes])
 
 
+bigpic=auto
+AC_ARG_ENABLE([bigpic],
+	[AC_HELP_STRING([--disable-bigpic],[Compile support for Big Picture Mining USB (default enabled)])],
+	[bigpic=$enableval]
+	)
+if test "x$bigpic" = "xno"; then
+	true
+elif test "x$bitfury" = "xyes"; then
+	bigpic=yes
+elif test "x$bigpic" = "xyes"; then
+	AC_MSG_ERROR([You explicitly disabled Bitfury and explicitly enabled BigPic])
+else
+	bigpic=no
+fi
+if test "x$bigpic" = "xyes"; then
+	AC_DEFINE([USE_BIGPIC], [1], [Defined to 1 if Big Picture Mining USB support is wanted])
+	need_fpgautils=yes
+fi
+AM_CONDITIONAL([HAS_BIGPIC], [test x$bigpic = xyes])
+
+
 littlefury=auto
 AC_ARG_ENABLE([littlefury],
 	[AC_HELP_STRING([--disable-littlefury],[Compile support for LittleFury (default enabled)])],