Commit 21a5f16e authored by Simon Dawson's avatar Simon Dawson Committed by Peter Korsgaard
Browse files

xserver_xorg-server: fix dbus/udev configure problem 



If both the dbus and udev packages are selected, then the configure step
for the xserver_xorg-server package fails as follows.

  configure: error: Hotplugging through both libudev and dbus/hal not allowed

The configure script no longer allows both the --enable-config-dbus
and --enable-config-udev options to be specified.

This patch changes the xserver_xorg-server makefile to use udev in preference
to dbus, when both are available.

Signed-off-by: default avatarSimon Dawson <spdawson@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 31b45a8c

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

+4 −6
Original line number Diff line number Diff line
@@ -104,16 +104,14 @@ XSERVER_XORG_SERVER_DEPENDENCIES += tslib 
XSERVER_XORG_SERVER_CONF_OPT += --enable-tslib LDFLAGS="-lts"

endif



ifeq ($(BR2_PACKAGE_UDEV),y)

XSERVER_XORG_SERVER_DEPENDENCIES += udev

XSERVER_XORG_SERVER_CONF_OPT += --enable-config-udev

else

ifeq ($(BR2_PACKAGE_DBUS),y)

XSERVER_XORG_SERVER_DEPENDENCIES += dbus

XSERVER_XORG_SERVER_CONF_OPT += --enable-config-dbus

endif



ifeq ($(BR2_PACKAGE_UDEV),y)

XSERVER_XORG_SERVER_CONF_OPT += --enable-config-udev

XSERVER_XORG_SERVER_DEPENDENCIES += udev

else

XSERVER_XORG_SERVER_CONF_OPT += --disable-config-udev

endif



ifeq ($(BR2_PACKAGE_FREETYPE),y)