diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-15 08:16:33 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-15 08:16:33 +0100 |
| commit | 6f6a2340d40759b77ef43965efdd24f3e4e623fd (patch) | |
| tree | eb25fb9622df69a72ee33e655617a1127780cb90 /mesalib/configure.ac | |
| parent | b41f74438672dd682bc01ae818cb3da654f22c1e (diff) | |
| download | vcxsrv-6f6a2340d40759b77ef43965efdd24f3e4e623fd.tar.gz vcxsrv-6f6a2340d40759b77ef43965efdd24f3e4e623fd.tar.bz2 vcxsrv-6f6a2340d40759b77ef43965efdd24f3e4e623fd.zip | |
libxcb mesa xserver xkeyboard-config git update 15 Feb 2013
xserver commit 90642948cc78834d95f7a3bddaac7ff77b68ed7e
libxcb commit 0dd8f8d26a758bc385e79d9239bf6ef2e3d7bf13
xkeyboard-config commit 067b0e4fd8d4fe707d86b24ae83bcacb61624231
mesa commit 6dbe94c12cd1b3b912a7083055178e0dfd7372af
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index d08bc2779..16c2f8c31 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -1683,16 +1683,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"` @@ -1861,6 +1859,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) |