diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-02-01 03:01:41 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2020-02-01 12:13:45 +0100 |
| commit | af06ddf51a8aeff452a13f597e46a9198c977158 (patch) | |
| tree | 19d460981f353facaac614191e690e18c4e6f62f | |
| parent | test: don't install /etc/securetty (diff) | |
| download | systemd-af06ddf51a8aeff452a13f597e46a9198c977158.tar.xz systemd-af06ddf51a8aeff452a13f597e46a9198c977158.zip | |
meson, man: do not install pam_systemd_home(8) when pam or homed is disabled
Fixes #14725.
| -rw-r--r-- | man/pam_systemd_home.xml | 2 | ||||
| -rw-r--r-- | man/rules/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/man/pam_systemd_home.xml b/man/pam_systemd_home.xml index 72a6d091bf..6dc1a830b6 100644 --- a/man/pam_systemd_home.xml +++ b/man/pam_systemd_home.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <!-- SPDX-License-Identifier: LGPL-2.1+ --> -<refentry id="pam_systemd_home" conditional='HAVE_PAM'> +<refentry id="pam_systemd_home" conditional='ENABLE_PAM_HOME'> <refentryinfo> <title>pam_systemd_home</title> diff --git a/man/rules/meson.build b/man/rules/meson.build index 9416c736c0..e55538be9c 100644 --- a/man/rules/meson.build +++ b/man/rules/meson.build @@ -46,7 +46,7 @@ manpages = [ ['nss-systemd', '8', ['libnss_systemd.so.2'], 'ENABLE_NSS_SYSTEMD'], ['os-release', '5', [], ''], ['pam_systemd', '8', [], 'HAVE_PAM'], - ['pam_systemd_home', '8', [], 'HAVE_PAM'], + ['pam_systemd_home', '8', [], 'ENABLE_PAM_HOME'], ['portablectl', '1', [], 'ENABLE_PORTABLED'], ['pstore.conf', '5', ['pstore.conf.d'], 'ENABLE_PSTORE'], ['repart.d', '5', [], 'ENABLE_REPART'], diff --git a/meson.build b/meson.build index ea69276019..2175ccac1d 100644 --- a/meson.build +++ b/meson.build @@ -1343,6 +1343,9 @@ else endif conf.set10('ENABLE_HOMED', have) +have = have and conf.get('HAVE_PAM') == 1 +conf.set10('ENABLE_PAM_HOME', have) + want_remote = get_option('remote') if want_remote != 'false' have_deps = [conf.get('HAVE_MICROHTTPD') == 1, |