]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
meson, man: do not install pam_systemd_home(8) when pam or homed is disabled
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 1 Feb 2020 02:01:41 +0000 (11:01 +0900)
committerLennart Poettering <lennart@poettering.net>
Sat, 1 Feb 2020 11:13:45 +0000 (12:13 +0100)
Fixes #14725.

man/pam_systemd_home.xml
man/rules/meson.build
meson.build

index 72a6d091bfcab3f0dbc5b41be8581237ef285d8a..6dc1a830b69e67d2db9b67f56429569dd3d9e2c8 100644 (file)
@@ -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>
index 9416c736c04f37cc944fff5fee27228c54979dc4..e55538be9c2930a802ee0f00a351b337bdf53315 100644 (file)
@@ -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'],
index ea6927601962f9c9e552025b87570cc5ffe93816..2175ccac1d4bd550d87bc8e3325faa35014b460f 100644 (file)
@@ -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,