Mesa (9.2): Fixed and/or order mistake, resulting in compiling llvmpipe without llvm installed

[Ian Romanick]

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

Author: Kristian Lehmann <email at zero-io.net>
Date:   Mon Aug 26 21:19:50 2013 +0200

Fixed and/or order mistake, resulting in compiling llvmpipe without llvm installed

Cc: 9.2 <mesa-stable at lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68544
Reviewed-by: Matt Turner <mattst88 at gmail.com>
(cherry picked from commit cec7b5c5bc300d4a415939bc6a913d441c687e47)

---

 configure.ac |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index d42afba..11a711f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1925,8 +1925,8 @@ AM_CONDITIONAL(NEED_GALLIUM_SOFTPIPE_DRIVER, test "x$HAVE_GALLIUM_SVGA" = xyes -
                                                   "x$HAVE_GALLIUM_I915" = xyes -o \
                                                   "x$HAVE_GALLIUM_SOFTPIPE" = xyes)
 AM_CONDITIONAL(NEED_GALLIUM_LLVMPIPE_DRIVER, test "x$HAVE_GALLIUM_I915" = xyes -o \
-                                                  "x$HAVE_GALLIUM_SOFTPIPE" = xyes -a \
-                                                  "x$MESA_LLVM" = x1)
+                                                  "x$HAVE_GALLIUM_SOFTPIPE" = xyes \
+                                                  && test "x$MESA_LLVM" = x1)
 
 if test "x$enable_gallium_loader" = xyes; then
     GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/null"