Mesa (master): configure.ac: Avoid running llvm-config when it hadn' t been checked for.

Marek Olšák mareko at kemper.freedesktop.org
Sun Jun 19 19:17:44 UTC 2011


Module: Mesa
Branch: master
Commit: 9ba2907f2ed893da3da1345647e34a597dd6ed07
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9ba2907f2ed893da3da1345647e34a597dd6ed07

Author: Cyril Brulebois <kibi at debian.org>
Date:   Wed Jun 15 15:50:02 2011 +0200

configure.ac: Avoid running llvm-config when it hadn't been checked for.

If --disable-gallium is passed, llvm-config isn't checked for, so mark
it explicitly as absent, through LLVM_CONFIG=no.

Passing --disable-gallium would result in:
| ../configure: line 9739: --version: command not found
| ../configure: line 9740: --cppflags: command not found
| ../configure: line 9741: --libs: command not found
| ../configure: line 9743: --ldflags: command not found

With this commit, one gets that instead:
| configure: error: LLVM is required to build Gallium R300 on x86 and x86_64

Signed-off-by: Cyril Brulebois <kibi at debian.org>

---

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

diff --git a/configure.ac b/configure.ac
index b2a0f66..871b16e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1511,6 +1511,8 @@ 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])




More information about the mesa-commit mailing list