Commit c1c9f907 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

xserver-xorg: dbus is optional

parent 7f975775

package/x11r7/xserver_xorg-server/Config.in

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER 
	select BR2_PACKAGE_XPROTO_GLPROTO

	select BR2_PACKAGE_XPROTO_KBPROTO

	select BR2_PACKAGE_XPROTO_RANDRPROTO

	select BR2_PACKAGE_DBUS

	select BR2_PACKAGE_FREETYPE

	select BR2_PACKAGE_XFONT_FONT_ALIAS if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS

	select BR2_PACKAGE_XFONT_FONT_MISC_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS

package/x11r7/xserver_xorg-server/xserver_xorg-server.mk

+6 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = freetype xutil_util-macros xlib_libXfont lib 
									xproto_resourceproto xproto_trapproto xproto_videoproto xproto_xcmiscproto \

									xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto \

									xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto \

									pixman dbus mcookie

									pixman mcookie



XSERVER_XORG_SERVER_CONF_OPT = --enable-freetype --disable-config-hal \

		--disable-xnest --disable-xephyr --disable-xvfb \
@@ -67,4 +67,9 @@ XSERVER_XORG_SERVER_DEPENDENCIES += tslib 
XSERVER_XORG_SERVER_CONF_OPT += --enable-tslib LDFLAGS="-lts"

endif



ifeq ($(BR2_PACKAGE_DBUS),y)

XSERVER_XORG_SERVER_DEPENDENCIES += dbus

XSERVER_XORG_SERVER_CONF_OPT += --enable-config-dbus

endif



$(eval $(call AUTOTARGETS,package/x11r7,xserver_xorg-server))