From: Michał Górny <mgorny@gentoo.org>
Date: Sat, 28 Dec 2013 14:22:09 +0000 (+0100)
Subject: Use AC_PATH_TOOL instead of AC_PATH_PROG for llvm-config.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5ea23763349346f642d8efdf27e1ea05e9b9e2a8;p=mesa.git

Use AC_PATH_TOOL instead of AC_PATH_PROG for llvm-config.

This should help with cross-compiling and multilib when $CHOST-specific
llvm-config is expected rather than build host default one.

It will help us a bit in Gentoo where we've started using
i686-pc-linux-gnu-llvm-config for 32-bit multilib LLVM.

Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=73100

CC: "10.0" <mesa-stable@lists.freedesktop.org>
---

diff --git a/configure.ac b/configure.ac
index 475bc6cb6a9..4da6c51d36b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1567,9 +1567,9 @@ if test "x$enable_gallium_llvm" = xauto; then
 fi
 if test "x$enable_gallium_llvm" = xyes; then
     if test "x$llvm_prefix" != x; then
-        AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no], ["$llvm_prefix/bin"])
+        AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no], ["$llvm_prefix/bin"])
     else
-        AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no])
+        AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no])
     fi
 
     if test "x$LLVM_CONFIG" != xno; then