Seems like test always priorities the _and_ over _or_ :)

Kris' patch does the right thing, although it can be simplified to either:

test "x$HAVE_GALLIUM_I915" = xyes -o "x$HAVE_GALLIUM_SOFTPIPE" = xyes && test
"x$MESA_LLVM" = x1

or

test "x$HAVE_GALLIUM_I915" = xyes -a "x$MESA_LLVM" = x1 -o
"x$HAVE_GALLIUM_SOFTPIPE" = xyes -a "x$MESA_LLVM" = x1

Feel free to test either one(all three :P) and send the git patch to the ML
mesa-dev@lists.freedesktop.org

Thanks for spotting this :)