diff -u a/configure.ac b/configure.ac
--- a/configure.ac	2013-08-25 21:37:50.025408949 +0200
+++ b/configure.ac	2013-08-25 22:59:30.583697987 +0200
@@ -1924,10 +1924,17 @@
 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"