From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Fri, 26 Apr 2024 15:07:39 +0000 (+0200)
Subject: import: skip the whole subdir when building with -Dimportd=false
X-Git-Tag: v256-rc2~190^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a68270c9795fd26b897a7cc33a8b39ae72d6d2c;p=thirdparty%2Fsystemd.git

import: skip the whole subdir when building with -Dimportd=false

Resolves: #32501
---

diff --git a/src/import/meson.build b/src/import/meson.build
index ca237266031..184dd7bbf2d 100644
--- a/src/import/meson.build
+++ b/src/import/meson.build
@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
+if conf.get('ENABLE_IMPORTD') != 1
+        subdir_done()
+endif
+
 systemd_importd_sources = files(
         'importd.c',
 )
@@ -117,15 +121,13 @@ executables += [
         },
 ]
 
-if conf.get('ENABLE_IMPORTD') == 1
-        install_data('org.freedesktop.import1.conf',
-                     install_dir : dbuspolicydir)
-        install_data('org.freedesktop.import1.service',
-                     install_dir : dbussystemservicedir)
-        install_data('org.freedesktop.import1.policy',
-                     install_dir : polkitpolicydir)
+install_data('org.freedesktop.import1.conf',
+             install_dir : dbuspolicydir)
+install_data('org.freedesktop.import1.service',
+             install_dir : dbussystemservicedir)
+install_data('org.freedesktop.import1.policy',
+             install_dir : polkitpolicydir)
 
-        install_data('import-pubring.gpg',
-                     install_dir : libexecdir)
-        # TODO: shouldn't this be in pkgdatadir?
-endif
+install_data('import-pubring.gpg',
+             install_dir : libexecdir)
+# TODO: shouldn't this be in pkgdatadir?