diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-27 10:22:14 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-27 10:22:14 +0200 |
| commit | ac46cfda36d6dbe8d5c092124a66ffe3f2bad15f (patch) | |
| tree | d1c2c7015f94e4cff6ed4124fa88913e02da2cca /mesalib/configure.ac | |
| parent | 427be67230f799417f3c364525484263d85cb17d (diff) | |
| parent | 84e570d071a041f85e2e8b92963d3390d14af5fc (diff) | |
| download | vcxsrv-ac46cfda36d6dbe8d5c092124a66ffe3f2bad15f.tar.gz vcxsrv-ac46cfda36d6dbe8d5c092124a66ffe3f2bad15f.tar.bz2 vcxsrv-ac46cfda36d6dbe8d5c092124a66ffe3f2bad15f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesalib git update 27 aug 2013
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 40e052c62..e20a2289a 100644 --- a/mesalib/configure.ac +++ b/mesalib/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" |