diff options
| author | Remko van der Vossen | 2016-03-02 21:28:00 +0100 |
|---|---|---|
| committer | Remko van der Vossen | 2016-03-02 21:28:00 +0100 |
| commit | 0533e837f4b1ef936d3a6ee851e22ce6d4c8930e (patch) | |
| tree | 1cbdfc9e8f3ac098c85bd1020016804ac77f1b69 /xorg-xserver | |
| parent | 49c135902506aabbd88537ef1ebed38360d2b218 (diff) | |
xorg-server: don't force dbus dependency when it isn't needed
Diffstat (limited to 'xorg-xserver')
| -rwxr-xr-x | xorg-xserver/xorg-server/DEPENDS | 15 | ||||
| -rw-r--r-- | xorg-xserver/xorg-server/HISTORY | 3 |
2 files changed, 11 insertions, 7 deletions
diff --git a/xorg-xserver/xorg-server/DEPENDS b/xorg-xserver/xorg-server/DEPENDS index 57adc138c7..56f1e70a42 100755 --- a/xorg-xserver/xorg-server/DEPENDS +++ b/xorg-xserver/xorg-server/DEPENDS @@ -55,20 +55,16 @@ optional_depends LOGIN-DAEMON \ '--enable-systemd-logind' \ '--disable-systemd-logind' \ 'login daemon' && -depends dbus && + # # May only select one: -# configure: error: Hotplugging through both libudev and dbus/hal not allowed -# -# NOTE: as hal depends on dbus, we can safely enable/disable dbus's configure -# options with hal +# configure: error: Hotplugging through both libudev and hal not allowed # # hal is preferred by upstream: # --enable-config-udev Build udev support (default: auto) # --disable-config-hal Build HAL support (default: auto) # - -message "You can either use hal+dbus OR udev for hotplugging" && +message "You can either use hal OR udev for hotplugging" && message "but NOT both" && optional_depends hal \ "--enable-config-hal --disable-config-udev" \ @@ -82,6 +78,11 @@ if ! is_depends_enabled $SPELL hal; then "enable udev kernel config support" fi && +if is_depends_enabled $SPELL $(get_spell_provider $SPELL LOGIN-DAEMON) \ + || is_depends_enabled $SPELL hal; then + depends dbus +fi && + optional_depends dmxproto \ "--enable-dmx" \ "--disable-dmx" \ diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY index c64bb1210a..9c3d83f6e1 100644 --- a/xorg-xserver/xorg-server/HISTORY +++ b/xorg-xserver/xorg-server/HISTORY @@ -1,3 +1,6 @@ +2016-03-02 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: don't force dbus dependency when it isn't needed + 2016-02-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: 1.18.1 PATCHLEVEL=1 |