From: Sven Eden <yamakuzure@gmx.net>
Date: Tue, 14 Aug 2018 16:21:43 +0000 (+0200)
Subject: Prep v239: 73-seat-late.rules is now built from 73-seat-late.rules.m4
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=5df5d72136c7c0b4a45a76463cb3441404f29cb4

Prep v239: 73-seat-late.rules is now built from 73-seat-late.rules.m4
---

diff --git a/pwx b/pwx
index e2a28187a..2bee2d829 160000
--- a/pwx
+++ b/pwx
@@ -1 +1 @@
-Subproject commit e2a28187a4904b089ace59d3ec65834799a2967b
+Subproject commit 2bee2d8292d4cfb3bfdfd6ac7db3a5ca75aca306
diff --git a/src/login/73-seat-late.rules.in b/src/login/73-seat-late.rules.m4
similarity index 70%
rename from src/login/73-seat-late.rules.in
rename to src/login/73-seat-late.rules.m4
index 5244e8a3d..c3487d25f 100644
--- a/src/login/73-seat-late.rules.in
+++ b/src/login/73-seat-late.rules.m4
@@ -1,8 +1,8 @@
 #  SPDX-License-Identifier: LGPL-2.1+
 #
-#  This file is part of systemd.
+#  This file is part of elogind.
 #
-#  systemd is free software; you can redistribute it and/or modify it
+#  elogind is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU Lesser General Public License as published by
 #  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
@@ -13,11 +13,14 @@ ENV{ID_SEAT}=="", ENV{ID_AUTOSEAT}=="1", ENV{ID_FOR_SEAT}!="", ENV{ID_SEAT}="sea
 ENV{ID_SEAT}=="", IMPORT{parent}="ID_SEAT"
 
 ENV{ID_SEAT}!="", TAG+="$env{ID_SEAT}"
-
 #if 0 /// elogind uses its own uaccess replacement command
-# TAG=="uaccess", ENV{MAJOR}!="", RUN{builtin}+="uaccess"
+# m4_ifdef(`HAVE_ACL',``
+# TAG=="uaccess", ENV{MAJOR}!="", RUN{builtin}+="uaccess"''
+# )m4_dnl
 #else
-TAG=="uaccess", ENV{MAJOR}!="", RUN{program}+="@rootlibexecdir@/elogind-uaccess-command %N $env{ID_SEAT}"
+m4_ifdef(`HAVE_ACL',``
+TAG=="uaccess", ENV{MAJOR}!="", RUN{program}+="@rootlibexecdir@/elogind-uaccess-command %N $env{ID_SEAT}"''
+)m4_dnl
 #endif // 0
 
 LABEL="seat_late_end"