Mesa (9.1): configure.ac: Add components to LLVM_COMPONENTS when using llvm shared libs

[Tom Stellard]

Module: Mesa
Branch: 9.1
Commit: 38e728498b8ef63bb7dce77c64af11c98ec2efa4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=38e728498b8ef63bb7dce77c64af11c98ec2efa4

Author: Tom Stellard <thomas.stellard at amd.com>
Date:   Fri Jan 25 16:43:11 2013 +0100

configure.ac: Add components to LLVM_COMPONENTS when using llvm shared libs

This is required when LLVM is built with CMake, which creates one
shared library for each component.
(cherry picked from commit 0898047e7b6f81dfe95ecd3b0a6d836c26fef9b3)

---

 configure.ac |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index d259eb9..598fd09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1667,16 +1667,14 @@ if test "x$enable_gallium_llvm" = xyes; then
     if test "x$LLVM_CONFIG" != xno; then
 	LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/svn.*//g'`
 	LLVM_VERSION_INT=`echo $LLVM_VERSION | sed -e 's/\([[0-9]]\)\.\([[0-9]]\)/\10\2/g'`
-        if test "x$with_llvm_shared_libs" != xyes; then
-            LLVM_COMPONENTS="engine bitwriter"
-            if $LLVM_CONFIG --components | grep -q '\<mcjit\>'; then
-                LLVM_COMPONENTS="${LLVM_COMPONENTS} mcjit"
-            fi
+        LLVM_COMPONENTS="engine bitwriter"
+        if $LLVM_CONFIG --components | grep -q '\<mcjit\>'; then
+            LLVM_COMPONENTS="${LLVM_COMPONENTS} mcjit"
+        fi
 
-            if test "x$enable_opencl" = xyes; then
-                LLVM_COMPONENTS="${LLVM_COMPONENTS} ipo linker instrumentation"
-            fi
-	fi
+        if test "x$enable_opencl" = xyes; then
+            LLVM_COMPONENTS="${LLVM_COMPONENTS} ipo linker instrumentation"
+        fi
 	LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
 	LLVM_BINDIR=`$LLVM_CONFIG --bindir`
 	LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"`
@@ -1845,6 +1843,9 @@ if test "x$with_gallium_drivers" != x; then
             if test "x$enable_r600_llvm" = xyes; then
                 USE_R600_LLVM_COMPILER=yes;
             fi
+            if test "x$enable_opencl" = xyes; then
+                LLVM_COMPONENTS="${LLVM_COMPONENTS} bitreader asmparser"
+            fi
             gallium_check_st "radeon/drm" "dri-r600" "xorg-r600" "" "xvmc-r600" "vdpau-r600"
             ;;
         xradeonsi)