From 10ed8e9d4171b0b127559614ea1f9784efe9490d Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Sun, 28 Aug 2011 23:49:17 +1000 Subject: [PATCH] Add a --disable-opencl configure option to make it possible to override detection of opencl and build without GPU mining support. --- configure.ac | 56 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/configure.ac b/configure.ac index de3153ab..62a72d76 100644 --- a/configure.ac +++ b/configure.ac @@ -51,26 +51,32 @@ case $target in ;; esac -# Check for OpenCL (the long way needed on mingw32 due to calling conventions) -AC_MSG_CHECKING([for OpenCL]) -SAVED_LIBS=$LIBS -LIBS="$LIBS $OPENCL_FLAGS" -AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[ - #ifdef __APPLE_CC__ - #include - #else - #include - #endif - ]], - [[return clSetKernelArg(0, 0, 0, 0); ]])], - [AC_MSG_RESULT(yes) - AC_DEFINE([HAVE_OPENCL], [1], [Defined to 1 if OpenCL is present on the system.]) - found_opencl=1 - OPENCL_LIBS=$OPENCL_FLAGS], - [AC_MSG_RESULT(no) - found_opencl=0]) -LIBS=$SAVED_LIBS +AC_ARG_ENABLE([opencl], + [AC_HELP_STRING([--disable-opencl],[Override detection and disable building with opencl])], + [opencl=$enableval] + ) +if test "x$opencl" != xno; then + # Check for OpenCL (the long way needed on mingw32 due to calling conventions) + AC_MSG_CHECKING([for OpenCL]) + SAVED_LIBS=$LIBS + LIBS="$LIBS $OPENCL_FLAGS" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[ + #ifdef __APPLE_CC__ + #include + #else + #include + #endif + ]], + [[return clSetKernelArg(0, 0, 0, 0); ]])], + [AC_MSG_RESULT(yes) + AC_DEFINE([HAVE_OPENCL], [1], [Defined to 1 if OpenCL is present on the system.]) + found_opencl=1 + OPENCL_LIBS=$OPENCL_FLAGS], + [AC_MSG_RESULT(no) + found_opencl=0]) + LIBS=$SAVED_LIBS +fi AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR([Could not find pthread library - please install libpthread])) @@ -201,8 +207,12 @@ AC_OUTPUT echo '' -if test $found_opencl = 1; then - echo OpenCL: FOUND. GPU mining support enabled. +if test "x$opencl" != xno; then + if test $found_opencl = 1; then + echo OpenCL: FOUND. GPU mining support enabled. + else + echo OpenCL: NOT FOUND. GPU mining support DISABLED. + fi else - echo OpenCL: NOT FOUND. GPU mining support DISABLED. + echo OpenCL: Detection overrided. GPU mining support DISABLED. fi