From 3211da4bcb951dd0f20e4413be192cb382ddcc32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 3 Oct 2017 12:19:30 +0200 Subject: [PATCH] build-sys: s/HAVE_UTMP/ENABLE_UTMP/ "Have" should be about the external environment and dependencies. Anything which is a pure yes/no choice should be "enable". --- man/rules/meson.build | 4 ++-- man/runlevel.xml | 2 +- man/systemd-update-utmp.service.xml | 2 +- meson.build | 2 +- src/basic/build.h | 2 +- src/shared/meson.build | 2 +- src/shared/utmp-wtmp.h | 6 +++--- tmpfiles.d/var.conf.m4 | 2 +- units/meson.build | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/man/rules/meson.build b/man/rules/meson.build index 9f7201a909..a20029797a 100644 --- a/man/rules/meson.build +++ b/man/rules/meson.build @@ -43,7 +43,7 @@ manpages = [ ['os-release', '5', [], ''], ['pam_systemd', '8', [], 'HAVE_PAM'], ['resolved.conf', '5', ['resolved.conf.d'], 'ENABLE_RESOLVED'], - ['runlevel', '8', [], 'HAVE_UTMP'], + ['runlevel', '8', [], 'ENABLE_UTMP'], ['sd-bus-errors', '3', ['SD_BUS_ERROR_ACCESS_DENIED', @@ -632,7 +632,7 @@ manpages = [ ['systemd-update-utmp.service', '8', ['systemd-update-utmp', 'systemd-update-utmp-runlevel.service'], - 'HAVE_UTMP'], + 'ENABLE_UTMP'], ['systemd-user-sessions.service', '8', ['systemd-user-sessions'], 'HAVE_PAM'], ['systemd-vconsole-setup.service', '8', diff --git a/man/runlevel.xml b/man/runlevel.xml index ca29c7c22c..50fdacde00 100644 --- a/man/runlevel.xml +++ b/man/runlevel.xml @@ -23,7 +23,7 @@ + conditional="ENABLE_UTMP"> runlevel diff --git a/man/systemd-update-utmp.service.xml b/man/systemd-update-utmp.service.xml index c8a9cb7c90..be7cec236c 100644 --- a/man/systemd-update-utmp.service.xml +++ b/man/systemd-update-utmp.service.xml @@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see . --> - + systemd-update-utmp.service diff --git a/meson.build b/meson.build index da0f015b76..5c98c937b7 100644 --- a/meson.build +++ b/meson.build @@ -1036,7 +1036,7 @@ else endif conf.set10('ENABLE_REMOTE', have) -foreach pair : [['utmp', 'HAVE_UTMP'], +foreach pair : [['utmp', 'ENABLE_UTMP'], ['hibernate', 'ENABLE_HIBERNATE'], ['environment-d', 'ENABLE_ENVIRONMENT_D'], ['binfmt', 'ENABLE_BINFMT'], diff --git a/src/basic/build.h b/src/basic/build.h index 8ca8f706cb..522974b5e4 100644 --- a/src/basic/build.h +++ b/src/basic/build.h @@ -61,7 +61,7 @@ #define _SYSVINIT_FEATURE_ "-SYSVINIT" #endif -#if HAVE_UTMP +#if ENABLE_UTMP #define _UTMP_FEATURE_ "+UTMP" #else #define _UTMP_FEATURE_ "-UTMP" diff --git a/src/shared/meson.build b/src/shared/meson.build index bb9720a94a..883821352e 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -108,7 +108,7 @@ if conf.get('HAVE_ACL') == 1 shared_sources += ['acl-util.c'] endif -if conf.get('HAVE_UTMP') == 1 +if conf.get('ENABLE_UTMP') == 1 shared_sources += ['utmp-wtmp.c'] endif diff --git a/src/shared/utmp-wtmp.h b/src/shared/utmp-wtmp.h index 8da594100a..8f4fbcdeff 100644 --- a/src/shared/utmp-wtmp.h +++ b/src/shared/utmp-wtmp.h @@ -25,7 +25,7 @@ #include "time-util.h" #include "util.h" -#if HAVE_UTMP +#if ENABLE_UTMP int utmp_get_runlevel(int *runlevel, int *previous); int utmp_put_shutdown(void); @@ -42,7 +42,7 @@ int utmp_wall( bool (*match_tty)(const char *tty, void *userdata), void *userdata); -#else /* HAVE_UTMP */ +#else /* ENABLE_UTMP */ static inline int utmp_get_runlevel(int *runlevel, int *previous) { return -ESRCH; @@ -71,4 +71,4 @@ static inline int utmp_wall( return 0; } -#endif /* HAVE_UTMP */ +#endif /* ENABLE_UTMP */ diff --git a/tmpfiles.d/var.conf.m4 b/tmpfiles.d/var.conf.m4 index e640fcd8c0..380c717ba6 100644 --- a/tmpfiles.d/var.conf.m4 +++ b/tmpfiles.d/var.conf.m4 @@ -12,7 +12,7 @@ q /var 0755 - - - L /var/run - - - - ../run d /var/log 0755 - - - -m4_ifdef(`HAVE_UTMP', +m4_ifdef(`ENABLE_UTMP', f /var/log/wtmp 0664 root utmp - f /var/log/btmp 0600 root utmp - f /var/log/lastlog 0664 root utmp - diff --git a/units/meson.build b/units/meson.build index f8ffe3fc45..9dbba98448 100644 --- a/units/meson.build +++ b/units/meson.build @@ -205,9 +205,9 @@ in_units = [ 'sysinit.target.wants/'], ['systemd-update-done.service', '', 'sysinit.target.wants/'], - ['systemd-update-utmp-runlevel.service', 'HAVE_UTMP HAVE_SYSV_COMPAT', + ['systemd-update-utmp-runlevel.service', 'ENABLE_UTMP HAVE_SYSV_COMPAT', 'multi-user.target.wants/ graphical.target.wants/ rescue.target.wants/'], - ['systemd-update-utmp.service', 'HAVE_UTMP', + ['systemd-update-utmp.service', 'ENABLE_UTMP', 'sysinit.target.wants/'], ['systemd-user-sessions.service', '', 'multi-user.target.wants/'],