[Mesa-dev] [PATCH v3 13/25] configure.ac: Move "--enable-gallium-llvm" check

[Tobias Droste]

Since all gallium driver that need LLVM need that check, move it to the
version check.

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

diff --git a/configure.ac b/configure.ac
index 61a0253..7b03531 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2369,11 +2369,12 @@ gallium_require_llvm() {
     case "$host" in *gnux32) return;; esac
     case "$host_cpu" in
     i*86|x86_64|amd64)
-        LLVM_REQUIRED_VERSION_MAJOR="3"
-        LLVM_REQUIRED_VERSION_MINOR="3"
-        if test "$LLVM_VERSION_INT" -lt "${LLVM_REQUIRED_VERSION_MAJOR}0${LLVM_REQUIRED_VERSION_MINOR}"; then
-            AC_MSG_ERROR([LLVM $LLVM_REQUIRED_VERSION_MAJOR.$LLVM_REQUIRED_VERSION_MINOR or newer is required])
+        if test "x$enable_gallium_llvm" != "xyes"; then
+            AC_MSG_ERROR([--enable-gallium-llvm is required when building $1])
         fi
+
+        llvm_check_version_for "3" "3" "0" "gallium"
+        llvm_add_target "x86" "gallium"
         ;;
     esac
 }
@@ -2420,9 +2421,6 @@ radeon_llvm_check() {
 }
 
 radeon_gallium_llvm_check() {
-    if test "x$enable_gallium_llvm" != "xyes"; then
-        AC_MSG_ERROR([--enable-gallium-llvm is required when building $1])
-    fi
     radeon_llvm_check $*
 }
 
@@ -2431,9 +2429,6 @@ swr_llvm_check() {
     if test ${LLVM_VERSION_INT} -lt 306; then
         AC_MSG_ERROR([LLVM version 3.6 or later required when building $1])
     fi
-    if test "x$enable_gallium_llvm" != "xyes"; then
-        AC_MSG_ERROR([--enable-gallium-llvm is required when building $1])
-    fi
 }
 
 swr_require_cxx_feature_flags() {
-- 
2.10.0