Browse Source

configure: Clean up zeusminer logic

Luke Dashjr 11 years ago
parent
commit
556337199d
1 changed files with 8 additions and 10 deletions
  1. 8 10
      configure.ac

+ 8 - 10
configure.ac

@@ -484,19 +484,17 @@ driverlist="$driverlist zeusminer"
 AC_ARG_ENABLE([zeusminer],
 AC_ARG_ENABLE([zeusminer],
 	[AC_HELP_STRING([--disable-zeusminer],[Compile support for ZeusMiner (default enabled with scrypt)])],
 	[AC_HELP_STRING([--disable-zeusminer],[Compile support for ZeusMiner (default enabled with scrypt)])],
 	[zeusminer=$enableval],
 	[zeusminer=$enableval],
-	[zeusminer=$scrypt])
+	[zeusminer=$ddauto])
 if test "x$zeusminer" = "xno"; then
 if test "x$zeusminer" = "xno"; then
 	true
 	true
-elif test "x$icarus" = "xyes"; then
-	if test "x$scrypt" = "xno"; then
-		AC_MSG_ERROR([You explicitly enabled ZeusMiner, but did not enable scrypt])
-	else
-		zeusminer=yes
-	fi
-elif test "x$zeusminer" = "xyes"; then
-	AC_MSG_ERROR([You explicitly disabled Icarus and explicitly enabled ZeusMiner])
-else
+elif test "x$icarus$scrypt" = "xyesyes"; then
+	zeusminer=yes
+elif test "x$zeusminer" = "xauto"; then
 	zeusminer=no
 	zeusminer=no
+elif test "x$scrypt" = "xno"; then
+	AC_MSG_ERROR([You explicitly enabled ZeusMiner, but did not enable scrypt])
+elif test "x$icarus" = "xno"; then
+	AC_MSG_ERROR([You explicitly disabled Icarus and explicitly enabled ZeusMiner])
 fi
 fi
 if test "x$zeusminer" = "xyes"; then
 if test "x$zeusminer" = "xyes"; then
 	AC_DEFINE([USE_ZEUSMINER], [1], [Defined to 1 if ZeusMiner support is wanted])
 	AC_DEFINE([USE_ZEUSMINER], [1], [Defined to 1 if ZeusMiner support is wanted])