xserver_xorg-server: allow xserver without the systemd login daemon

Signed-off-by: Sagaert Johan <sagaert.johan@proximus.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index ae689068c56a0d92ea9dd8aad9091b85a7745575..ce4069b9277d3eb88466f15cf2d45380d0418ff9 100644 (file)
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -64,6 +64,17 @@ XSERVER_XORG_SERVER_CONF_OPTS = \
        --with-fontrootdir=/usr/share/fonts/X11/ \
        --$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB),en,dis)able-xvfb
 
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+XSERVER_XORG_CONF_OPTS += \
+       --with-systemd-daemon \
+       --enable-systemd-logind
+XSERVER_XORG_SERVER_DEPENDENCIES += systemd
+else
+XSERVER_XORG_CONF_OPTS += \
+       --without-systemd-daemon \
+       --disable-systemd-logind
+endif
+
 ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
 XSERVER_XORG_SERVER_CONF_OPTS += --enable-xorg
 XSERVER_XORG_SERVER_DEPENDENCIES += libpciaccess