aboutsummaryrefslogtreecommitdiff
path: root/mesalib/configure.ac
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-05-03 15:37:14 +0000
committermarha <marha@users.sourceforge.net>2011-05-03 15:37:14 +0000
commite4bd55e182560fa87af77ee3ec49fc1a907ead85 (patch)
treef77ade9dac153a4f45e08ccaf260de8d8ddbbb17 /mesalib/configure.ac
parente8af1ef3142aaaf2d17f2d3710e23eee1baf8a61 (diff)
parentcc93496bdbb3e7aea51033ece75fa85cfb5845d4 (diff)
downloadvcxsrv-e4bd55e182560fa87af77ee3ec49fc1a907ead85.tar.gz
vcxsrv-e4bd55e182560fa87af77ee3ec49fc1a907ead85.tar.bz2
vcxsrv-e4bd55e182560fa87af77ee3ec49fc1a907ead85.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/configure.ac')
-rw-r--r--mesalib/configure.ac7
1 files changed, 7 insertions, 0 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index 9e1693a5d..bfde4e870 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -1784,6 +1784,13 @@ AC_ARG_ENABLE([gallium-r300],
[build gallium r300 @<:@default=build DRI driver only@:>@])],
[enable_gallium_r300="$enableval"],
[enable_gallium_r300=auto])
+
+if test "$mesa_driver" != dri ; then
+ if test "x$enable_gallium_r300" = xauto; then
+ enable_gallium_r300=no
+ fi
+fi
+
if test "x$enable_gallium_r300" != xno; then
if test "x$MESA_LLVM" = x0; then
case "$host_cpu" in