From bd441fa27a22b7c6e11d9330560e0622fb69f297 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 28 Nov 2013 12:07:29 -0500 Subject: [PATCH] build-sys: make multi-seat-x optional At some point it should become disabled by default. http://lists.freedesktop.org/archives/systemd-devel/2013-November/014869.html --- Makefile.am | 4 ++++ configure.ac | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/Makefile.am b/Makefile.am index 90874dfb8..3598edd26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4141,6 +4141,8 @@ MULTI_USER_TARGET_WANTS += \ SYSTEM_UNIT_ALIASES += \ systemd-logind.service dbus-org.freedesktop.login1.service +if ENABLE_MULTI_SEAT_X + systemd_multi_seat_x_SOURCES = \ src/login/multi-seat-x.c @@ -4151,6 +4153,8 @@ systemd_multi_seat_x_LDADD = \ rootlibexec_PROGRAMS += \ systemd-multi-seat-x +endif + dist_udevrules_DATA += \ src/login/70-uaccess.rules \ src/login/70-power-switch.rules diff --git a/configure.ac b/configure.ac index f1b00c5ae..ab24266fa 100644 --- a/configure.ac +++ b/configure.ac @@ -793,6 +793,14 @@ if test "x$enable_efi" != "xno"; then fi AM_CONDITIONAL(ENABLE_EFI, [test "x$have_efi" = "xyes"]) +# ------------------------------------------------------------------------------ +have_multi_seat_x=no +AC_ARG_ENABLE(multi_seat_x, AS_HELP_STRING([--disable-multi-seat-x], [do not build multi-seat-x])) +if test "x$enable_multi_seat_x" != "xno"; then + have_multi_seat_x=yes +fi +AM_CONDITIONAL(ENABLE_MULTI_SEAT_X, [test "$have_multi_seat_x" = "yes"]) + # ------------------------------------------------------------------------------ AC_ARG_WITH(rc-local-script-path-start, AS_HELP_STRING([--with-rc-local-script-path-start=PATH], @@ -1077,6 +1085,7 @@ AC_MSG_RESULT([ nss-myhostname: ${have_myhostname} gudev: ${enable_gudev} gintrospection: ${enable_introspection} + multi-seat-x: ${have_multi_seat_x} Python: ${have_python} Python Headers: ${have_python_devel} man pages: ${have_manpages} -- 2.30.2