Commit c12825c6bd2935f73f5b6c4df3b3c1ab0c1e72cd
2011-07-14T12:19:59
Fix configure.ac OpenCL test for OSX.
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 55 56
diff --git a/configure.ac b/configure.ac
index 476c9dc..7e3898d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,10 @@ AC_CHECK_HEADERS(syslog.h)
AC_FUNC_ALLOCA
+have_win32=false
+PTHREAD_FLAGS="-pthread"
+OPENCL_FLAGS="-lOpenCL"
+
case $target in
*-*-mingw*)
have_x86_64=false
@@ -33,27 +37,33 @@ case $target in
;;
x86_64-*)
have_x86_64=true
- have_win32=false
- PTHREAD_FLAGS="-pthread"
;;
+ *-*-darwin*)
+ have_x86_64=false
+ OPENCL_FLAGS="-framework OpenCL"
+ ;;
*)
have_x86_64=false
- have_win32=false
- PTHREAD_FLAGS="-pthread"
;;
esac
# Check for OpenCL (the long way needed on mingw32 due to calling conventions)
AC_MSG_CHECKING([for OpenCL])
SAVED_LIBS=$LIBS
-LIBS="$LIBS -lOpenCL"
+LIBS="$LIBS $OPENCL_FLAGS"
AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[#include <CL/cl.h>]],
+ [AC_LANG_PROGRAM([[
+ #ifdef __APPLE_CC__
+ #include <OpenCL/opencl.h>
+ #else
+ #include <CL/cl.h>
+ #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=-lOpenCL],
+ OPENCL_LIBS=$OPENCL_FLAGS],
[AC_MSG_RESULT(no)
found_opencl=0])
LIBS=$SAVED_LIBS