From: Tobias Droste <tdroste@gmx.de>
Date: Sat, 19 Nov 2016 01:38:53 +0000 (+0100)
Subject: configure.ac: Don't search llvm-config if it's known
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2350387d24d6f2470450ee9e78792a9ee957034b;p=mesa.git

configure.ac: Don't search llvm-config if it's known

This way LLVM_CONFIG can bet set from an env variable if it's outside
the $llvm_prefix.

This is not a must, but it helps testing.

Signed-off-by: Tobias Droste <tdroste@gmx.de>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
---

diff --git a/configure.ac b/configure.ac
index f62bc61e502..fbe6fda0138 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2166,10 +2166,12 @@ if test "x$enable_gallium_llvm" = xauto; then
     esac
 fi
 if test "x$enable_gallium_llvm" = xyes || test "x$HAVE_RADEON_VULKAN" = xyes; then
-    if test -n "$llvm_prefix"; then
-        AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no], ["$llvm_prefix/bin"])
-    else
-        AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no])
+    if test -z "$LLVM_CONFIG"; then
+        if test -n "$llvm_prefix"; then
+            AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no], ["$llvm_prefix/bin"])
+        else
+            AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no])
+        fi
     fi
 
     if test "x$LLVM_CONFIG" != xno; then