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

[Tor Lillqvist]

 configure.ac |   18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

New commits:
commit 90520bfe633e65acded019179af3e9930ed1e238
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Aug 10 13:29:12 2013 +0300

    Simplify test and remove typo
    
    If what we want is to compile the OpenCL code by default always on OS
    X when building against a SDK newer than 10.6, that can be said
    simpler.
    
    Change-Id: I14b2cd107fe0dba42c221bec63fd4076fffbd848

diff --git a/configure.ac b/configure.ac
index d0501f8..63396d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10081,17 +10081,13 @@ 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
-    if test "$with_open_sdk" = yes -o "$with_macosx_sdk" != "10.6" ; then
-        AC_MSG_RESULT([yes, always on OS X])
-        ENABLE_OPENCL=TRUE
-        OPENCL_CFLAGS=
-        OPENCL_LIBS="-framework OpenCL"
-        AC_DEFINE(HAVE_FEATURE_OPENCL)
-    else
-        AC_MSG_RESULT([no])
-    fi
+if test \( -z "$with_opencl_sdk" -o "$with_opencl_sdk" = yes \) -a $_os = Darwin -a "$with_macosx_sdk" != 10.6; then
+    # OS X SDK > 10.6
+    AC_MSG_RESULT([yes, always on OS X > 10.6])
+    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
     AC_MSG_RESULT([no])
 else