Commit 36a65e41ead338537d3c253ef9ea5beaa9881ad3
2011-09-06T10:24:05
Add a --disable-adl option to configure and only enable it if opencl support exists.
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
diff --git a/configure.ac b/configure.ac
index 7490ba7..c234adf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,10 +119,19 @@ PTHREAD_LIBS=-lpthread
AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)
-AC_CHECK_FILE([ADL_SDK/adl_sdk.h], have_adl=true, have_adl=false,)
-if test x$have_adl = xtrue
-then
- AC_DEFINE([HAVE_ADL], [1], [Defined if ADL headers were found])
+AC_ARG_ENABLE([adl],
+ [AC_HELP_STRING([--disable-adl],[Override detection and disable building with adl])],
+ [adl=$enableval]
+ )
+
+if test "$found_opencl" = 1; then
+ if test "x$adl" != xno; then
+ AC_CHECK_FILE([ADL_SDK/adl_sdk.h], have_adl=true, have_adl=false,)
+ if test x$have_adl = xtrue
+ then
+ AC_DEFINE([HAVE_ADL], [1], [Defined if ADL headers were found])
+ fi
+ fi
fi
AC_SEARCH_LIBS(addstr, ncurses pdcurses, ,
@@ -253,6 +262,7 @@ echo
echo
echo "Configuration Options Summary:"
echo
+
if test "x$opencl" != xno; then
if test $found_opencl = 1; then
echo " OpenCL...............: FOUND. GPU mining support enabled"
@@ -263,10 +273,14 @@ else
echo " OpenCL...............: Detection overrided. GPU mining support DISABLED"
fi
-if test x$have_adl = xtrue; then
- echo " ADL..................: SDK found, GPU monitoring support enabled"
+if test "x$adl" != xno; then
+ if test x$have_adl = xtrue; then
+ echo " ADL..................: SDK found, GPU monitoring support enabled"
+ else
+ echo " ADL..................: SDK NOT found, GPU monitoring support DISABLED"
+ fi
else
- echo " ADL..................: SDK NOT found, GPU monitoring support DISABLED"
+ echo " ADL..................: Detection overrided. GPU monitoring support DISABLED"
fi
echo " ASM..................: $has_yasm"