summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2011-10-02 16:53:21 +0200
committerMarek Olšák <maraeo@gmail.com>2011-10-02 16:53:21 +0200
commitae633fa0ef0985ef239e6f7f0fcf772bac5c02ad (patch)
tree24108137496b129d060daefe493666419e8214af
parent25861dc7f3d4aa62382b230a7e6d5ebfe8ecae04 (diff)
configure.ac: fix xlib-based softpipe build
Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk> NOTE: This is a candidate for the 7.11 branch. (cherry picked from commit c6f59fcd00101a2f93a5a97d679f3b160ef0126a) Conflicts: configure.ac
-rw-r--r--configure.ac5
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 1ca1dcecb4d..817bf8b248f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1810,6 +1810,11 @@ if test "x$with_gallium_drivers" != x; then
gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau"
;;
xswrast)
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS softpipe"
+ if test "x$MESA_LLVM" = x1; then
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
+ fi
+
if test "x$HAVE_ST_DRI" = xyes; then
GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-swrast"
fi