From 5845c82d1016a3e3f2696180d5ac91b46950540a Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 27 Feb 2018 12:56:21 +0800 Subject: [PATCH 29/31] nss-mymachines: Build conditionally when ENABLE_MYHOSTNAME is set Fixes build failures when building with --disable-myhostname Upstream-Status: Pending Signed-off-by: Khem Raj Signed-off-by: Chen Qi --- meson.build | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 1b947adac..1ed4dde72 100644 --- a/meson.build +++ b/meson.build @@ -1351,12 +1351,15 @@ test_dlopen = executable( link_with : [libbasic], dependencies : [libdl]) -foreach tuple : [['myhostname', 'ENABLE_MYHOSTNAME'], - ['systemd', 'ENABLE_NSS_SYSTEMD'], - ['mymachines', 'ENABLE_MACHINED'], - ['resolve', 'ENABLE_RESOLVE']] +foreach tuple : [['myhostname', 'ENABLE_MYHOSTNAME', ''], + ['systemd', 'ENABLE_NSS_SYSTEMD', ''], + ['mymachines', 'ENABLE_MACHINED', 'ENABLE_MYHOSTNAME'], + ['resolve', 'ENABLE_RESOLVE', '']] condition = tuple[1] == '' or conf.get(tuple[1]) == 1 + if tuple[2] != '' and condition + condition = conf.get(tuple[2]) == 1 + endif if condition module = tuple[0] -- 2.13.0