[Mesa-stable] [PATCH] configure.ac: Fix order of "and"/"or" for AM_CONDITIONAL

[Chí-Thanh Christopher Nguyễn]

From: Kris <email at zero-io.net>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68544
CC: mesa-stable at lists.freedesktop.org
---
 configure.ac | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 40e052c..f135f81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1924,10 +1924,17 @@ AM_CONDITIONAL(HAVE_GALLIUM_LLVMPIPE, test "x$HAVE_GALLIUM_LLVMPIPE" = xyes)
 AM_CONDITIONAL(NEED_GALLIUM_SOFTPIPE_DRIVER, test "x$HAVE_GALLIUM_SVGA" = xyes -o \
                                                   "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 \
+
+if test "x$HAVE_GALLIUM_I915" = xyes -o "x$HAVE_GALLIUM_SOFTPIPE" = xyes; then
+	NEED_GALLIUM_LLVMPIPE=yes
+else
+	NEED_GALLIUM_LLVMPIPE=no
+fi
+
+AM_CONDITIONAL(NEED_GALLIUM_LLVMPIPE_DRIVER, test "x$NEED_GALLIUM_LLVMPIPE" = xyes -a \
                                                   "x$MESA_LLVM" = x1)
 
+
 if test "x$enable_gallium_loader" = xyes; then
     GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/null"
 
-- 
1.8.1.5