meson: Re-shuffle PAM

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

diff --git a/meson.build b/meson.build
index b28a9b7b109b0aae1bed60ac4dff58ba12448565..1d58e95cc248b9014f1cab88909914138fe43fa7 100644 (file)
--- 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 aae75b80e33c7f9b4f1404a941a88a9d2db4533a..24abbe0ca569606dd5253037f6ab453367b815b2 100644 (file)
--- 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