Mesa (7.11): configure.ac: do not check for llvm-config if llvm is disabled

Marek Olšák mareko at kemper.freedesktop.org
Mon Jul 25 21:55:23 UTC 2011


Module: Mesa
Branch: 7.11
Commit: 13d12b35e90e4c2e7ba3beb6b2cf7fff3c4429d5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=13d12b35e90e4c2e7ba3beb6b2cf7fff3c4429d5

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sat Jul 23 15:57:51 2011 +0200

configure.ac: do not check for llvm-config if llvm is disabled

---

 configure.ac |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4e7a8eb..3f8cc06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1610,9 +1610,6 @@ dnl Gallium configuration
 dnl
 if test "x$with_gallium_drivers" != x; then
     SRC_DIRS="$SRC_DIRS gallium gallium/winsys gallium/targets"
-    AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no])
-else
-    LLVM_CONFIG=no
 fi
 
 AC_SUBST([LLVM_CFLAGS])
@@ -1734,6 +1731,8 @@ if test "x$enable_gallium_llvm" = xauto; then
     esac
 fi
 if test "x$enable_gallium_llvm" = xyes; then
+    AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no])
+
     if test "x$LLVM_CONFIG" != xno; then
 	LLVM_VERSION=`$LLVM_CONFIG --version`
 	LLVM_CFLAGS=`$LLVM_CONFIG --cppflags`




More information about the mesa-commit mailing list