Browse Source

Fix build and distdir.

Con Kolivas 12 years ago
parent
commit
3d835fc3e9
3 changed files with 6 additions and 3 deletions
  1. 1 1
      Makefile.am
  2. 3 0
      cgminer.c
  3. 2 2
      configure.ac

+ 1 - 1
Makefile.am

@@ -78,7 +78,7 @@ cgminer_SOURCES += driver-icarus.c
 endif
 
 if HAS_AVALON
-cgminer_SOURCES += driver-avalon.c
+cgminer_SOURCES += driver-avalon.c driver-avalon.h
 endif
 
 if HAS_MODMINER

+ 3 - 0
cgminer.c

@@ -47,7 +47,10 @@
 #include "driver-opencl.h"
 #include "bench_block.h"
 #include "scrypt.h"
+
+#ifdef USE_AVALON
 #include "driver-avalon.h"
+#endif
 
 #if defined(unix)
 	#include <errno.h>

+ 2 - 2
configure.ac

@@ -478,14 +478,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" = xnonononononono; then
+		if test "x$bitforce$avalon$icarus$ztex$modminer$bflsc" = xnononononono; 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" = xnonononononono; then
+	if test "x$bitforce$icarus$avalon$ztex$modminer$bflsc" = xnononononono; then
 		AC_MSG_ERROR([No mining configured in])
 	fi
 	echo "  scrypt...............: Disabled (needs OpenCL)"