[Libreoffice-commits] core.git: configure.ac

[Michael Meeks]

 configure.ac |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 5e28f6e9d3021171b12a7827cd5c93cfda1fcd90
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Fri Jul 12 19:11:21 2013 +0100

    Disable openCL by default on Mac (for now).
    
    Change-Id: Iaf54a64a9e910eaffe1526f3471df8f98854343d

diff --git a/configure.ac b/configure.ac
index 3f9dbdd..6f5fe8dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9811,14 +9811,15 @@ OPENCL_LIBS=
 OPENCL_CFLAGS=
 ENABLE_OPENCL=
 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" -o "$with_opencl_sdk" = no; then
+dnl if test \( -z "$with_opencl_sdk" -o "$with_opencl_sdk" = yes \) -a $_os = Darwin; then
+dnl    # OS X
+dnl    AC_MSG_RESULT([yes, always on OS X])
+dnl    ENABLE_OPENCL=TRUE
+dnl    OPENCL_CFLAGS=
+dnl    OPENCL_LIBS="-framework OpenCL"
+dnl    AC_DEFINE(HAVE_FEATURE_OPENCL)
+dnl
+if test -z "$with_opencl_sdk" -o "$with_opencl_sdk" = no; then
     AC_MSG_RESULT([no])
 else
     if test -d "$with_opencl_sdk/include"; then