summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-07-21 09:53:51 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2010-07-21 09:53:51 +0200
commit8bbf552993397ece696272f1f75fa47af110a005 (patch)
tree71b32ddf2638449d40b39f882b83f8953df9788b
parentfd5b0dc8fe3bb3f53e23553e0710baa64f6ae107 (diff)
xserver: dri support is only for the modular server
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index e32215f00..f3ffea9e8 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -121,10 +121,14 @@ ifneq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y)
XSERVER_XORG_SERVER_CONF_OPT += --disable-composite
endif
+ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)
ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)
XSERVER_XORG_SERVER_DEPENDENCIES += xproto_dri2proto
XSERVER_XORG_SERVER_CONF_OPT += --enable-dri2
endif
+else
+XSERVER_XORG_SERVER_CONF_OPT += --disable-dri2
+endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXSCRNSAVER),y)
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXScrnSaver