summaryrefslogtreecommitdiff
path: root/package/x11r7/xserver_xorg-server
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-11-07 21:02:38 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2010-11-07 21:02:38 +0100
commit69a8991bdc7f2f7262c81166430c825b61fc1c7c (patch)
tree9e753521b768b0b9242ab0ce25352bebb883bf57 /package/x11r7/xserver_xorg-server
parent70fb5d46ee05a1bb74fc3361b64c7bfcd8a87297 (diff)
xserver-xorg: enable glx support if mesa3d is enabled
Closes #2533 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/x11r7/xserver_xorg-server')
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index b0babddee..31b23f092 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -64,7 +64,7 @@ XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
--with-fontdir=/usr/share/fonts/X11/
ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)
-XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg --disable-glx
+XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libpciaccess libdrm
else
XSERVER_XORG_SERVER_CONF_OPT += --disable-xorg
@@ -147,5 +147,10 @@ ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y)
XSERVER_XORG_SERVER_CONF_OPT += --disable-dmx
endif
+ifeq ($(BR2_PACKAGE_MESA3D),y)
+XSERVER_XORG_SERVER_CONF_OPT += --enable-glx
+else
+XSERVER_XORG_SERVER_CONF_OPT += --disable-glx
+endif
$(eval $(call AUTOTARGETS,package/x11r7,xserver_xorg-server))