diff options
| -rw-r--r-- | meson.build | 46 | ||||
| -rw-r--r-- | src/network/meson.build | 52 | ||||
| -rw-r--r-- | src/test/meson.build | 2 |
3 files changed, 51 insertions, 49 deletions
diff --git a/meson.build b/meson.build index 404a2aa473..116325fb7d 100644 --- a/meson.build +++ b/meson.build @@ -855,7 +855,7 @@ if want_importd != 'no' conf.get('HAVE_ZLIB', 0) == 1 and conf.get('HAVE_BZIP2', 0) == 1 and conf.get('HAVE_XZ', 0) == 1 and - conf.get('HAVE_LZ4', 0) == 1) + conf.get('HAVE_LIBGCRYPT', 0) == 1) if have_deps conf.set('ENABLE_IMPORTD', 1) elif want_importd == 'yes' @@ -2030,28 +2030,30 @@ executable('systemd-nspawn', install_rpath : rootlibexecdir, install : true) -executable('systemd-networkd', - systemd_networkd_sources, - include_directories : includes, - link_with : [libnetworkd_core, - libfirewall, - libsystemd_network, - libudev_internal, - libshared, - libsystemd_internal], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) +if conf.get('ENABLE_NETWORKD', 0) == 1 + executable('systemd-networkd', + systemd_networkd_sources, + include_directories : includes, + link_with : [libnetworkd_core, + libfirewall, + libsystemd_network, + libudev_internal, + libshared, + libsystemd_internal], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) -executable('systemd-networkd-wait-online', - systemd_networkd_wait_online_sources, - include_directories : includes, - link_with : [libnetworkd_core, - libshared, - libsystemd_internal], - install_rpath : rootlibexecdir, - install : true, - install_dir : rootlibexecdir) + executable('systemd-networkd-wait-online', + systemd_networkd_wait_online_sources, + include_directories : includes, + link_with : [libnetworkd_core, + libshared, + libsystemd_internal], + install_rpath : rootlibexecdir, + install : true, + install_dir : rootlibexecdir) +endif executable('networkctl', networkctl_sources, diff --git a/src/network/meson.build b/src/network/meson.build index a41ead952b..66d6a52dcf 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -110,33 +110,33 @@ if conf.get('ENABLE_NETWORKD', 0) == 1 install_dir : dbussystemservicedir) install_data('systemd-networkd.rules', install_dir : polkitrulesdir) -endif -tests += [ - [['src/network/test-networkd-conf.c'], - [libnetworkd_core, - libsystemd_network, - libudev], - []], + tests += [ + [['src/network/test-networkd-conf.c'], + [libnetworkd_core, + libsystemd_network, + libudev], + []], - [['src/network/test-network.c'], - [libnetworkd_core, - libudev_internal, - libsystemd_network, - libsystemd_internal, - libfirewall], - [libiptc]], + [['src/network/test-network.c'], + [libnetworkd_core, + libudev_internal, + libsystemd_network, + libsystemd_internal, + libfirewall], + [libiptc]], - [['src/network/test-network-tables.c', - 'src/network/test-network-tables.c', - test_tables_h], - [libnetworkd_core, - libudev_internal, - libudev_core, - libsystemd_network, - libsystemd_internal, - libfirewall], - [], - '', '', [], - [network_include_dir] + libudev_core_includes], + [['src/network/test-network-tables.c', + 'src/network/test-network-tables.c', + test_tables_h], + [libnetworkd_core, + libudev_internal, + libudev_core, + libsystemd_network, + libsystemd_internal, + libfirewall], + [], + '', '', [], + [network_include_dir] + libudev_core_includes], ] +endif diff --git a/src/test/meson.build b/src/test/meson.build index 6c950c3f0c..26b399dfc5 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -424,7 +424,7 @@ tests += [ [libshared, libsystemd_internal], [libkmod], - '', 'manual'], + 'HAVE_KMOD', 'manual'], [['src/test/test-ellipsize.c'], [libshared], |