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 /src | |
| 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 'src')
| -rw-r--r-- | src/network/meson.build | 52 | ||||
| -rw-r--r-- | src/test/meson.build | 2 |
2 files changed, 27 insertions, 27 deletions
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], |