From 21a5f16edb8d28da0df19d82f0655e2b49e2abaa Mon Sep 17 00:00:00 2001 From: Simon Dawson Date: Sun, 23 Sep 2012 02:18:20 +0000 Subject: 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: Simon Dawson Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'package/x11r7/xserver_xorg-server/xserver_xorg-server.mk') diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index a19122d4a..8018a8907 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -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) -- cgit v1.2.3