From: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue, 10 Jun 2014 02:25:04 +0000 (+0900)
Subject: configure: Only check for OpenCL without LLVM when the latter is certain
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2d399bb1837e01856c8e489aa5ec439ce9a1fdbc;p=mesa.git

configure: Only check for OpenCL without LLVM when the latter is certain

LLVM is enabled by default for some architectures, but the test was failing
before that.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>

Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org>
---

diff --git a/configure.ac b/configure.ac
index 1525b20f9a8..cb14c0c6623 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1462,10 +1462,6 @@ if test "x$enable_opencl" = xyes; then
         AC_MSG_ERROR([cannot enable OpenCL without Gallium])
     fi
 
-    if test "x$enable_gallium_llvm" != xyes; then
-        AC_MSG_ERROR([cannot enable OpenCL without LLVM])
-    fi
-
     if test $GCC_VERSION_MAJOR -lt 4 -o $GCC_VERSION_MAJOR -eq 4 -a $GCC_VERSION_MINOR -lt 7; then
         AC_MSG_ERROR([gcc >= 4.7 is required to build clover])
     fi
@@ -1766,6 +1762,10 @@ if test "x$enable_gallium_llvm" = xyes; then
 else
     MESA_LLVM=0
     LLVM_VERSION_INT=0
+
+    if test "x$enable_opencl" = xyes; then
+        AC_MSG_ERROR([cannot enable OpenCL without LLVM])
+    fi
 fi
 
 dnl Directory for XVMC libs