From: Andrew Jeddeloh Date: Thu, 25 Jan 2018 21:17:17 +0000 (-0800) Subject: login/meson.build: require ACL for uaccess rules X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b378688cfed10574fc103527aaa230f0cb4c498d;p=elogind.git login/meson.build: require ACL for uaccess rules Don't install udev rules that requires the uaccess builtin if systemd is being built without the uaccess builtin. --- diff --git a/src/login/meson.build b/src/login/meson.build index 401741e6b..d5ec1786a 100644 --- a/src/login/meson.build +++ b/src/login/meson.build @@ -13,8 +13,8 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with elogind; If not, see . +# along with systemd; If not, see . #if 0 /// rename to elogind # # systemd_logind_sources = files(''' @@ -132,19 +132,27 @@ loginctl_sources += files(''' # install : install_polkit, # install_dir : polkitpolicydir) # -# install_data('70-power-switch.rules', -# '70-uaccess.rules', +# install_data('70-power-switch.rules', install_dir : udevrulesdir) +# +# if conf.get('HAVE_ACL') == 1 +# install_data('70-uaccess.rules', install_dir : udevrulesdir) +# endif +# +# seat_rules = configure_file( +# input : '71-seat.rules.in', +# output : '71-seat.rules', +# configuration : substs) +# install_data(seat_rules, # install_dir : udevrulesdir) # -# foreach file : ['71-seat.rules', -# '73-seat-late.rules'] -# gen = configure_file( -# input : file + '.in', -# output : file, -# configuration : substs) -# install_data(gen, -# install_dir : udevrulesdir) -# endforeach +# custom_target( +# '73-seat-late.rules', +# input : '73-seat-late.rules.m4', +# output: '73-seat-late.rules', +# command : [m4, '-P'] + m4_defines + ['@INPUT@'], +# capture : true, +# install : true, +# install_dir : udevrulesdir) # # custom_target( # 'systemd-user',