Merge pull request #5821 from mbiebl/meson-no-libiptc

Merge libfirewall into libshared, and link libshared to libip[46]tc directly.

meson.build

@@ -2146,8 +2146,7 @@ exe = executable('systemd-nspawn',
                  'src/core/loopback-setup.c',
                  'src/core/loopback-setup.h',
                  include_directories : [includes, include_directories('src/nspawn')],
-                 link_with : [libfirewall,
-                              libshared,
+                 link_with : [libshared,
                               libudev],
                  dependencies : [libacl,
                                  libblkid,
@@ -2162,7 +2161,6 @@ if conf.get('ENABLE_NETWORKD', 0) == 1
                    systemd_networkd_sources,
                    include_directories : includes,
                    link_with : [libnetworkd_core,
-                                libfirewall,
                                 libsystemd_network,
                                 libudev_internal,
                                 libshared],

src/network/meson.build

@@ -128,9 +128,8 @@ if conf.get('ENABLE_NETWORKD', 0) == 1
      [libnetworkd_core,
       libudev_internal,
       libsystemd_network,
-      libshared,
-      libfirewall],
-     [libiptc]],
+      libshared],
+     []],
 
     [['src/network/test-network-tables.c',
       'src/network/test-network-tables.c',
@@ -139,8 +138,7 @@ if conf.get('ENABLE_NETWORKD', 0) == 1
       libudev_internal,
       libudev_core,
       libsystemd_network,
-      libshared,
-      libfirewall],
+      libshared],
      [],
      '', '', [],
      [network_include_dir] + libudev_core_includes],

src/shared/meson.build

@@ -34,6 +34,7 @@ shared_sources = '''
         efivars.h
         fdset.c
         fdset.h
+        firewall-util.h
         fstab-util.c
         fstab-util.h
         gcrypt-util.c
@@ -114,6 +115,10 @@ if conf.get('HAVE_SECCOMP', 0) == 1
         shared_sources += ['seccomp-util.c']
 endif
 
+if conf.get('HAVE_LIBIPTC', 0) == 1
+        shared_sources += ['firewall-util.c']
+endif
+
 libshared_name = 'systemd-shared-@0@'.format(meson.project_version())
 
 libshared = shared_library(
@@ -152,21 +157,9 @@ libshared_static = static_library(
                         libcap,
                         libacl,
                         libcryptsetup,
-                        libiptc,
                         libseccomp,
                         libselinux,
                         libidn,
                         libxz,
                         liblz4,
                         libblkid])
-
-if conf.get('HAVE_LIBIPTC', 0) == 1
-        libfirewall = static_library(
-                'firewall',
-                'firewall-util.h',
-                'firewall-util.c',
-                include_directories : includes,
-                dependencies : [libiptc])
-else
-        libfirewall = []
-endif

src/test/meson.build

@@ -415,8 +415,7 @@ tests += [
 
 
         [['src/test/test-firewall-util.c'],
-         [libfirewall,
-          libshared],
+         [libshared],
          [],
          'HAVE_LIBIPTC'],