Mesa (master): configure.ac: do not check for llvm-config if llvm is disabled
Marek Olšák
mareko at kemper.freedesktop.org
Mon Jul 25 21:56:26 UTC 2011
Module: Mesa
Branch: master
Commit: 99fba503b112a69a2fc14b7dd40684d9a6a1972a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=99fba503b112a69a2fc14b7dd40684d9a6a1972a
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
NOTE: This is a candidate for the 7.11 branch.
---
configure.ac | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0ea264e..5c832e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1699,9 +1699,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])
@@ -1821,6 +1818,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|sed 's/-DNDEBUG\>//g'`
More information about the mesa-commit
mailing list