diff options
| author | Simon Dawson <spdawson@gmail.com> | 2012-09-23 02:18:20 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-23 20:53:30 +0200 |
| commit | 21a5f16edb8d28da0df19d82f0655e2b49e2abaa (patch) | |
| tree | afa0bcb6eec7a71c141d10d7395796b1f2fea381 /package/x11r7 | |
| parent | 31b45a8c72b365c09100a7cb99c82c8e63d1b479 (diff) | |
| download | buildroot-novena-21a5f16edb8d28da0df19d82f0655e2b49e2abaa.tar.gz buildroot-novena-21a5f16edb8d28da0df19d82f0655e2b49e2abaa.zip | |
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 <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/x11r7')
| -rw-r--r-- | package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 10 |
1 files changed, 4 insertions, 6 deletions
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) |