daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
4bff0a
From fff862ce6f33acb6ce8dc422e0f53ec681ebed6d Mon Sep 17 00:00:00 2001
4bff0a
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
4bff0a
Date: Tue, 7 Aug 2018 18:10:53 +0200
4bff0a
Subject: [PATCH] meson: drop duplicated condition
4bff0a
4bff0a
The generic check suffices for those four.
4bff0a
4bff0a
(cherry picked from commit 6bd2bc8e16a6d515f8a21c47fd6b833d7fcfdd1c)
4bff0a
4bff0a
Resolves: #1696224
4bff0a
---
4bff0a
 meson.build | 8 ++++----
4bff0a
 1 file changed, 4 insertions(+), 4 deletions(-)
4bff0a
4bff0a
diff --git a/meson.build b/meson.build
4bff0a
index 863e8eb399..f623bcf37d 100644
4bff0a
--- a/meson.build
4bff0a
+++ b/meson.build
4bff0a
@@ -3003,10 +3003,10 @@ foreach tuple : [
4bff0a
         ['blkid'],
4bff0a
         ['dbus'],
4bff0a
         ['glib'],
4bff0a
-        ['nss-myhostname',   conf.get('ENABLE_NSS_MYHOSTNAME') == 1],
4bff0a
-        ['nss-mymachines',   conf.get('ENABLE_NSS_MYMACHINES') == 1],
4bff0a
-        ['nss-resolve',      conf.get('ENABLE_NSS_RESOLVE') == 1],
4bff0a
-        ['nss-systemd',      conf.get('ENABLE_NSS_SYSTEMD') == 1],
4bff0a
+        ['nss-myhostname'],
4bff0a
+        ['nss-mymachines'],
4bff0a
+        ['nss-resolve'],
4bff0a
+        ['nss-systemd'],
4bff0a
         ['hwdb'],
4bff0a
         ['tpm'],
4bff0a
         ['man pages',        want_man],