GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-22 12:34:27 +00:00
Code Issues Releases Wiki Activity

Breaks nvidia building. Roll back for now.

Browse Source 
Revert "configure.ac, Makefile.am: Allow setting of OpenCL location"

This reverts commit a9893d818dac53cb52c2ed06ece59195228f44d9.
This commit is contained in:
ckolivas 2011-07-01 13:21:18 +10:00 committed by Con Kolivas
parent 2a8475b5bd
commit 3983f1b9c3
2 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -9,8 +9,7 @@ EXTRA_DIST = example-cfg.json
SUBDIRS = compat
INCLUDES = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES) \
@OPENCL_INCLUDES@
INCLUDES = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES)
bin_PROGRAMS = minerd

26
configure.ac
View File

@ -39,31 +39,8 @@ case $target in
;;
esac
dnl Figure out where OpenCL is, either passed or system-wide
AC_ARG_WITH([opencl-libdir],
[AC_HELP_STRING([--with-opencl-libdir],[specify OpenCL library])],
[with_opencl_lib=$withval],
[with_opencl_lib="auto"])
if test "x$with_opencl_lib" = xauto; then
AC_CHECK_LIB([OpenCL], [OpenCL], [OPENCL_LIBS="-lOpenCL"], AC_MSG_ERROR([OpenCL library could not be found]))
else
OPENCL_LIBS="$with_opencl_lib/libOpenCL.so"
fi
OPENCL_INCLUDES=""
AC_ARG_WITH([opencl-inc],
[AC_HELP_STRING([--with-opencl-inc],[specify OpenCL include paths])],
[with_opencl_inc=$withval],
[with_opencl_inc="auto"])
if test "x$with_opencl_inc" = xauto; then
AC_CHECK_HEADERS(CL/cl.h, [found="yes"])
AC_CHECK_HEADERS(OpenCL/opencl.h, [found="yes"])
if test "x$found" = x; then
AC_MSG_ERROR([OpenCL headers could not be found])
fi
else
OPENCL_INCLUDES="-I$with_opencl_inc"
fi
AC_CHECK_LIB(OpenCL, clSetKernelArg, OPENCL_LIBS=-lOpenCL)
AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)
AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIBS=-lpthread)
@ -120,7 +97,6 @@ LIBCURL_CHECK_CONFIG(, 7.10.1, ,
[AC_MSG_ERROR([Missing required libcurl >= 7.10.1])])
AC_SUBST(OPENCL_LIBS)
AC_SUBST(OPENCL_INCLUDES)
AC_SUBST(JANSSON_LIBS)
AC_SUBST(PTHREAD_FLAGS)
AC_SUBST(PTHREAD_LIBS)