From 24dcd86d9a2b8c8bc23b0240254949b0d24ef4a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Fri, 27 May 2022 19:49:23 -0400 Subject: [PATCH] meson: Re-shuffle PAM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- meson.build | 4 +--- src/lxc/pam/meson.build | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meson.build b/meson.build index b28a9b7b1..1d58e95cc 100644 --- a/meson.build +++ b/meson.build @@ -569,9 +569,7 @@ liblxc_includes = [basic_includes, include_directories( # Early sub-directories. subdir('src/include') subdir('src/lxc') -if want_pam_cgroup == true - subdir('src/lxc/pam') -endif +subdir('src/lxc/pam') # Library. liblxc_dependencies = [ diff --git a/src/lxc/pam/meson.build b/src/lxc/pam/meson.build index aae75b80e..24abbe0ca 100644 --- a/src/lxc/pam/meson.build +++ b/src/lxc/pam/meson.build @@ -16,12 +16,14 @@ pam_cgfs_sources = files( '../string_utils.c', '../string_utils.h') + include_sources -pam_cgfs = shared_module( - 'pam_cgfs', - include_directories: pam_cgfs_includes, - sources: pam_cgfs_sources, - dependencies: [pkgconfig_libs], - name_prefix: '', - install_mode: 'rw-r--r--', # 644 - install: true, - install_dir: pam_security) +if want_pam_cgroup == true + pam_cgfs = shared_module( + 'pam_cgfs', + include_directories: pam_cgfs_includes, + sources: pam_cgfs_sources, + dependencies: [pkgconfig_libs], + name_prefix: '', + install_mode: 'rw-r--r--', # 644 + install: true, + install_dir: pam_security) +endif