Mesa (master): configure.ac: fix xlib-based softpipe build

[Marek Olšák]

Module: Mesa
Branch: master
Commit: c6f59fcd00101a2f93a5a97d679f3b160ef0126a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c6f59fcd00101a2f93a5a97d679f3b160ef0126a

Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Jul 26 01:05:13 2011 +0200

configure.ac: fix xlib-based softpipe build

Tested-by: Jon TURNEY <jon.turney at dronecode.org.uk>

NOTE: This is a candidate for the 7.11 branch.

---

 configure.ac |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5c832e6..40924a9 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
             ;;
         *)