From: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue, 17 Jul 2012 16:30:13 +0000 (+0200)
Subject: configure.ac: Further LLVM fixups.
X-Git-Tag: accepted/2.0alpha-wayland/20121114.171706~1158
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=761131ce4591e5f55f38d13f2c4d2194bc9cb0fd;p=profile%2Fivi%2Fmesa.git

configure.ac: Further LLVM fixups.

* Also add mcjit in the non-OpenCL case.
* Replace hardcoded llvm-config with $LLVM_CONFIG everywhere.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Tom Stellad <thomas.stellard@amd.com>
---

diff --git a/configure.ac b/configure.ac
index 068f632..1d60957 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1847,9 +1847,9 @@ if test "x$enable_gallium_llvm" = xyes; then
 	    dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
 	    LLVM_LIBS="-lLLVM-`$LLVM_CONFIG --version`"
 	else
-	    LLVM_LIBS="`$LLVM_CONFIG --libs engine bitwriter`"
+	    LLVM_LIBS="`$LLVM_CONFIG --libs engine bitwriter mcjit`"
             if test "x$enable_opencl" = xyes; then
-                LLVM_LIBS="${LLVM_LIBS} `llvm-config --libs ipo linker instrumentation mcjit`"
+                LLVM_LIBS="${LLVM_LIBS} `$LLVM_CONFIG --libs ipo linker instrumentation`"
             fi
 	fi
 	LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
@@ -2007,7 +2007,7 @@ if test "x$with_gallium_drivers" != x; then
                 USE_R600_LLVM_COMPILER=yes;
             fi
             if test "x$enable_opencl" = xyes -a "x$with_llvm_shared_libs" = xno; then
-                LLVM_LIBS="${LLVM_LIBS} `llvm-config --libs bitreader asmparser`"
+                LLVM_LIBS="${LLVM_LIBS} `$LLVM_CONFIG --libs bitreader asmparser`"
             fi
             gallium_check_st "radeon/drm" "dri-r600" "xorg-r600" "" "xvmc-r600" "vdpau-r600" "va-r600"
             ;;