diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-12 12:14:30 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-23 21:47:27 -0400 |
| commit | f0bd7cc7012190e91183e9ee7649dd423e25629d (patch) | |
| tree | 48fce4ba7180f1039af572665752902573c9a12d /meson.build | |
| parent | 421f0012777f02b6d6568ac43cc226dee2c404de (diff) | |
meson: fix compilation with -Dnetworkd=false, -Dkmod=no, -Dlibgcrypt=no
The tests are included under the conditional too, instead of specifying
'ENABLE_NETWORKD' in the test definition array, because libnetworkd_core
dependency is undefined if networkd is disabled.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 46 |
1 files changed, 24 insertions, 22 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, |