summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2014-06-10 11:25:04 +0900
committerCarl Worth <cworth@cworth.org>2014-06-23 11:45:48 -0700
commit1d46c58b83dec2a182f3f10dcff7ac65d2dc57ce (patch)
tree93838ccb46cd75dd2f2ce46a9aceb290aa8205be /configure.ac
parentf7fd6e52ec0b7c580efb78c8bd6997b91b4d7108 (diff)
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> (cherry picked from commit 2d399bb1837e01856c8e489aa5ec439ce9a1fdbc)
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac8
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 02397387029..1e86e4b94ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1387,10 +1387,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
@@ -1677,6 +1673,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