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.

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

src/test/meson.build

@@ -424,7 +424,7 @@ tests += [
    [libshared,
     libsystemd_internal],
    [libkmod],
-   '', 'manual'],
+   'HAVE_KMOD', 'manual'],
 
   [['src/test/test-ellipsize.c'],
    [libshared],