diff options
| author | Marek Olšák <[email protected]> | 2011-07-26 01:05:13 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2011-07-28 00:25:12 +0200 |
| commit | c6f59fcd00101a2f93a5a97d679f3b160ef0126a (patch) | |
| tree | 85fe8bb3366360a26cf225be9650e47abd6382d1 | |
| parent | f622c6d7a23c480f6a17e4b3f81731231180e019 (diff) | |
configure.ac: fix xlib-based softpipe build
Tested-by: Jon TURNEY <[email protected]>
NOTE: This is a candidate for the 7.11 branch.
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 5c832e64669..40924a966c5 100644 --- a/configure.ac +++ b/configure.ac @@ -1936,11 +1936,12 @@ if test "x$with_gallium_drivers" != x; then gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau" "" "xvmc-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_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS softpipe" - if test "x$MESA_LLVM" = x1; then - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe" - fi GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-swrast" fi if test "x$HAVE_ST_VDPAU" = xyes; then @@ -1958,9 +1959,6 @@ if test "x$with_gallium_drivers" != x; then if test "x$HAVE_WINSYS_XLIB" != xyes; then GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib" fi - if test "x$HAVE_ST_DRI" != xyes; then - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS softpipe" - fi fi ;; *) |