aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/drivers
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-02-09 08:46:41 +0100
committermarha <marha@users.sourceforge.net>2012-02-09 08:46:41 +0100
commit535951cba015f2a2b63292e0ca983d0d6e736b71 (patch)
tree8c0e0364a27f250e926abe165b82ca12e5a841bf /mesalib/src/mesa/drivers
parentebb6162f9cbc1af0fac0b670b5aa38c8bb7a7446 (diff)
parent474621addc25cb22865c54b70ffbec07c82eb04c (diff)
downloadvcxsrv-535951cba015f2a2b63292e0ca983d0d6e736b71.tar.gz
vcxsrv-535951cba015f2a2b63292e0ca983d0d6e736b71.tar.bz2
vcxsrv-535951cba015f2a2b63292e0ca983d0d6e736b71.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/drivers')
-rw-r--r--mesalib/src/mesa/drivers/dri/Makefile.am6
1 files changed, 5 insertions, 1 deletions
diff --git a/mesalib/src/mesa/drivers/dri/Makefile.am b/mesalib/src/mesa/drivers/dri/Makefile.am
index 8b9358221..48d36858b 100644
--- a/mesalib/src/mesa/drivers/dri/Makefile.am
+++ b/mesalib/src/mesa/drivers/dri/Makefile.am
@@ -1,4 +1,8 @@
-SUBDIRS = common
+SUBDIRS =
+
+if HAVE_COMMON_DRI
+SUBDIRS+=common
+endif
if HAVE_I915_DRI
SUBDIRS+=i915