[Mesa-dev] [PATCH v3 11/25] configure.ac: Move oCL LLVM checks to the oCL section

[Tobias Droste]

The LLVM checks can be anywhere below line 1000 now.
Move the openCL LLVM checks to the section with the other openCL checks.
No functional change.

Signed-off-by: Tobias Droste <tdroste at gmx.de>
---
 configure.ac | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0ebf14c..283e553 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2146,6 +2146,25 @@ if test "x$enable_opencl" = xyes; then
     if test "x$have_libelf" != xyes; then
        AC_MSG_ERROR([Clover requires libelf])
     fi
+
+    llvm_check_version_for "3" "6" "0" "opencl"
+
+    llvm_add_component "all-targets" "opencl"
+    llvm_add_component "ipos" "opencl"
+    llvm_add_component "linker" "opencl"
+    llvm_add_component "instrumentation" "opencl"
+    llvm_add_component "irreader" "yes" "opencl"
+    llvm_add_component "option" "yes" "opencl"
+    llvm_add_component "objcarcopts" "opencl"
+    llvm_add_component "profiledata" "opencl"
+
+    dnl Check for Clang internal headers
+    if test -z "$CLANG_LIBDIR"; then
+        CLANG_LIBDIR=${LLVM_LIBDIR}
+    fi
+    CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
+    AS_IF([test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"],
+        [AC_MSG_ERROR([Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries.])])
 fi
 AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes)
 AM_CONDITIONAL(HAVE_CLOVER_ICD, test "x$enable_opencl_icd" = xyes)
@@ -2303,29 +2322,6 @@ if test "x$enable_gallium_llvm" = xyes; then
     gallium_llvm_check
 fi
 
-if test "x$enable_opencl" = xyes; then
-    llvm_check_version_for "3" "6" "0" "opencl"
-
-    llvm_add_component "all-targets" "opencl"
-    llvm_add_component "ipos" "opencl"
-    llvm_add_component "linker" "opencl"
-    llvm_add_component "instrumentation" "opencl"
-    llvm_add_component "irreader" "yes" "opencl"
-    llvm_add_component "option" "yes" "opencl"
-    llvm_add_component "objcarcopts" "opencl"
-    llvm_add_component "profiledata" "opencl"
-fi
-
-dnl Check for Clang internal headers
-if test "x$enable_opencl" = xyes; then
-    if test -z "$CLANG_LIBDIR"; then
-        CLANG_LIBDIR=${LLVM_LIBDIR}
-    fi
-    CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
-    AS_IF([test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"],
-        [AC_MSG_ERROR([Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries.])])
-fi
-
 dnl Directory for XVMC libs
 AC_ARG_WITH([xvmc-libdir],
     [AS_HELP_STRING([--with-xvmc-libdir=DIR],
-- 
2.10.0