From 2a7722d365e03c638596efcdc57686e7c967b34e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 17 Jun 2013 19:26:45 +0300 Subject: [PATCH] No need to check on OS X Change-Id: Ib7dc7b4e6f4dd5829116968f9c86d431b16a5071 --- configure.ac | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 4615ef365d71..42d1569b2069 100644 --- a/configure.ac +++ b/configure.ac @@ -9845,19 +9845,26 @@ dnl ================================================= OPENCL_LIBS= OPENCL_CFLAGS= ENABLE_OPENCL= -AC_MSG_CHECKING([opencl sdk]) -if test "z$with_opencl_sdk" = "z"; then - AC_MSG_RESULT([no]) +AC_MSG_CHECKING([OpenCL]) +if test \( -z "$with_opencl_sdk" -o "$with_opencl_sdk" = yes \) -a $_os = Darwin; then + # OS X + AC_MSG_RESULT([yes, always on OS X]) + ENABLE_OPENCL=TRUE + OPENCL_CFLAGS= + OPENCL_LIBS="-framework OpenCL" + AC_DEFINE(HAVE_FEATURE_OPENCL) +elif test "z$with_opencl_sdk" = "z"; then + AC_MSG_RESULT([no]) else - if test -d $with_opencl_sdk/include; then - ENABLE_OPENCL=TRUE - OPENCL_CFLAGS="-I$with_opencl_sdk/include" - OPENCL_LIBS="-L$with_opencl_sdk/lib/x86 -lOpenCL" - AC_MSG_RESULT([found at path $with_opencl_sdk]) - AC_DEFINE(HAVE_FEATURE_OPENCL) - else - AC_MSG_ERROR([no headers found found at $with_opencl_sdk/include ]) - fi + if test -d $with_opencl_sdk/include; then + ENABLE_OPENCL=TRUE + OPENCL_CFLAGS="-I$with_opencl_sdk/include" + OPENCL_LIBS="-L$with_opencl_sdk/lib/x86 -lOpenCL" + AC_MSG_RESULT([found at path $with_opencl_sdk]) + AC_DEFINE(HAVE_FEATURE_OPENCL) + else + AC_MSG_ERROR([no headers found found at $with_opencl_sdk/include ]) + fi fi AC_SUBST(OPENCL_CFLAGS) AC_SUBST(OPENCL_LIBS)