diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-10 11:33:12 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-10 11:33:12 +0200 |
| commit | d79e641dea89c0d5d651b11971c4c9e14df34629 (patch) | |
| tree | 59d636ef9c4c21906ea28ac719589f25b9794d0a /mesalib/configure.ac | |
| parent | bf59764a4685c4bef029eddfa75d7496d2a91ae0 (diff) | |
| parent | c6f80401dc533b04341afe8d596960d1bc25efce (diff) | |
| download | vcxsrv-d79e641dea89c0d5d651b11971c4c9e14df34629.tar.gz vcxsrv-d79e641dea89c0d5d651b11971c4c9e14df34629.tar.bz2 vcxsrv-d79e641dea89c0d5d651b11971c4c9e14df34629.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/os/log.c
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 1c437e7ba..21e4308fa 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -1779,6 +1779,13 @@ AC_ARG_ENABLE([gallium-llvm], [build gallium LLVM support @<:@default=enabled on x86/x86_64@:>@])], [enable_gallium_llvm="$enableval"], [enable_gallium_llvm=auto]) + +AC_ARG_WITH([llvm-shared-libs], + [AS_HELP_STRING([--with-llvm-shared-libs], + [link with LLVM shared libraries @<:@default=disabled@:>@])], + [with_llvm_shared_libs=yes], + [with_llvm_shared_libs=no]) + if test "x$with_gallium_drivers" = x; then enable_gallium_llvm=no fi @@ -1793,8 +1800,12 @@ 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_CFLAGS=`$LLVM_CONFIG --cppflags|sed -e 's/-DNDEBUG\>//g' -e 's/-pedantic//g'` - LLVM_LIBS="`$LLVM_CONFIG --libs engine bitwriter`" - + if test "x$with_llvm_shared_libs" = 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`" + fi LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags` DEFINES="$DEFINES -D__STDC_CONSTANT_MACROS" MESA_LLVM=1 @@ -1805,6 +1816,14 @@ else MESA_LLVM=0 fi +dnl Directory for XVMC libs +AC_ARG_WITH([xvmc-libdir], + [AS_HELP_STRING([--with-xvmc-libdir=DIR], + [directory for the XVMC libraries @<:@default=${libdir}@:>@])], + [XVMC_LIB_INSTALL_DIR="$withval"], + [XVMC_LIB_INSTALL_DIR='${libdir}']) +AC_SUBST([XVMC_LIB_INSTALL_DIR]) + dnl Directory for VDPAU libs AC_ARG_WITH([vdpau-libdir], [AS_HELP_STRING([--with-vdpau-libdir=DIR], |