diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-03-16 15:48:07 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-03-16 15:48:07 +0000 |
| commit | c1c9f9075784c9c05e70ae4907b78e421ca0f37e (patch) | |
| tree | bfd9b2f552a47ebb9255cfc71ac3c884cd3c7ecd /package/x11r7/xserver_xorg-server | |
| parent | 7f975775b4bff09724d2f20bd5ceb4262b076a1c (diff) | |
xserver-xorg: dbus is optional
Diffstat (limited to 'package/x11r7/xserver_xorg-server')
| -rw-r--r-- | package/x11r7/xserver_xorg-server/Config.in | 1 | ||||
| -rw-r--r-- | package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 1136c9b58..540320050 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -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 diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 7f1742644..156c0a22b 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -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)) |