44 files changed, 152 insertions, 73 deletions
diff --git a/src/arm/meson.build b/src/arm/meson.build
index 305dd3963..ec7740a91 100644
--- a/src/arm/meson.build
+++ b/src/arm/meson.build
@@ -3,17 +3,60 @@ libgnunetarm_src = ['arm_api.c',
 gnunetservicearm_src = ['gnunet-service-arm.c']
+gnunetarm_src = ['gnunet-arm.c']
-if gnunet_monolith == false
+testarmapi_src = ['test_arm_api.c']
+testexpbo_src = ['test_exponential_backoff.c']
+testgnunetservice_src = ['test_gnunet_service_arm.c']
+configure_file(input : 'arm.conf.in',
+               output : 'arm.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+if get_option('monolith') == false
  libgnunetarm = library('gnunetarm',
          libgnunetarm_src,
          dependencies: libgnunetutil_dep,
-          include_directories: [incdir, configuration_inc])
+          soversion: '2.0.0',
+          include_directories: [incdir, configuration_inc],
+          install: true,
+          install_dir: get_option('libdir'))
  libgnunetarm_dep = declare_dependency(link_with : libgnunetarm)
+  executable ('gnunet-arm',
+              gnunetarm_src,
+              dependencies: [libgnunetarm_dep, libgnunetutil_dep],
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('bindir'))
  executable ('gnunet-service-arm',
              gnunetservicearm_src,
              dependencies: [libgnunetarm_dep, libgnunetutil_dep],
-              include_directories: [incdir, configuration_inc])
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+  testarmapi = executable ('test_arm_api',
+              testarmapi_src,
+              dependencies: [libgnunetarm_dep, libgnunetutil_dep],
+              include_directories: [incdir, configuration_inc],
+              install: false)
+  testexpbo = executable ('test_exponential_backoff',
+              testexpbo_src,
+              dependencies: [libgnunetarm_dep, libgnunetutil_dep],
+              include_directories: [incdir, configuration_inc],
+              install: false)
+  testgnunetservice = executable ('test_gnunet_service',
+              testgnunetservice_src,
+              dependencies: [libgnunetarm_dep, libgnunetutil_dep],
+              include_directories: [incdir, configuration_inc],
+              install: false)
+  configure_file(copy: true,
+                 input: 'test_arm_api_data.conf',
+                 output: 'test_arm_api_data.conf')
+  test('test_arm_api', testarmapi)
+  test('test_exponential_backoff', testexpbo)
+  test('test_gnunet_service', testgnunetservice)
 else
  foreach p : libgnunetarm_src + gnunetservicearm_src
    gnunet_src += 'arm/' + p
diff --git a/src/ats/meson.build b/src/ats/meson.build
index f08358e3a..4804e95a2 100644
--- a/src/ats/meson.build
+++ b/src/ats/meson.build
@@ -13,17 +13,21 @@ gnunetserviceats_src = ['gnunet-service-ats.c',
                        'gnunet-service-ats_scheduling.c',
                        'gnunet-service-ats_reservations.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetats = library('gnunetats',
          libgnunetats_src,
          dependencies: [libgnunetutil_dep, libgnunethello_dep],
-          include_directories: [incdir, configuration_inc])
+          include_directories: [incdir, configuration_inc],
+          install: true,
+          install_dir: get_option('libdir'))
  libgnunetats_dep = declare_dependency(link_with : libgnunetats)
  executable ('gnunet-service-ats',
              gnunetserviceats_src,
              dependencies: [libgnunetats_dep, libgnunetutil_dep,
                             libgnunetnt_dep, libgnunetstatistics_dep],
-              include_directories: [incdir, configuration_inc])
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('libdir') / 'gnunet' / 'libexec')
 else
  foreach p : libgnunetats_src + gnunetserviceats_src
    gnunet_src += 'ats/' + p
diff --git a/src/block/meson.build b/src/block/meson.build
index 704f97068..aae7445ee 100644
--- a/src/block/meson.build
+++ b/src/block/meson.build
@@ -1,16 +1,20 @@
 libgnunetblock_src = ['block.c']
 libgnunetblockgroup_src = ['bg_bf.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetblock = library('gnunetblock',
          libgnunetblock_src,
          dependencies: libgnunetutil_dep,
-          include_directories: [incdir, configuration_inc])
+          include_directories: [incdir, configuration_inc],
+          install: true,
+          install_dir: get_option('libdir'))
  libgnunetblock_dep = declare_dependency(link_with : libgnunetblock)
  libgnunetblockgroup = library('gnunetblockgroup',
          libgnunetblockgroup_src,
          dependencies: [libgnunetutil_dep, libgnunetblock_dep],
-          include_directories: [incdir, configuration_inc])
+          include_directories: [incdir, configuration_inc],
+          install: true,
+          install_dir: get_option('libdir'))
  libgnunetblockgroup_dep = declare_dependency(link_with : libgnunetblockgroup)
 else
  foreach p : libgnunetblock_src + libgnunetblockgroup_src
diff --git a/src/cadet/meson.build b/src/cadet/meson.build
index 9534fc35b..ca7a5a91b 100644
--- a/src/cadet/meson.build
+++ b/src/cadet/meson.build
@@ -18,11 +18,13 @@ gnunetservicecadet_src = ['gnunet-service-cadet.c',
                          'gnunet-service-cadet_peer.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetcadet = library('gnunetcadet',
          libgnunetcadet_src,
          dependencies: libgnunetutil_dep,
-          include_directories: [incdir, configuration_inc])
+          include_directories: [incdir, configuration_inc],
+          install: true,
+          install_dir: get_option('libdir'))
  libgnunetcadet_dep = declare_dependency(link_with : libgnunetcadet)
  executable ('gnunet-cadet',
              gnunetservicecadet_src,
@@ -35,7 +37,9 @@ if gnunet_monolith == false
                             libgnunetats_dep,
                             libgnunettransport_dep,
                             libgnunethello_dep],
-              include_directories: [incdir, configuration_inc])
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('bindir'))
  executable ('gnunet-service-cadet',
              gnunetservicecadet_src,
              dependencies: [libgnunetcadet_dep,
@@ -48,9 +52,11 @@ if gnunet_monolith == false
                             libgnunetpeerinfo_dep,
                             libgnunethello_dep,
                             libgnunetblock_dep],
-              include_directories: [incdir, configuration_inc])
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('libdir') / 'gnunet' / 'libexec')
 else
-  foreach p : libgnunetcadet_src + gnunetservicecadet_src + gnunetcadet_src
+  foreach p : libgnunetcadet_src + gnunetservicecadet_src
    gnunet_src += 'cadet/' + p
  endforeach
 endif
diff --git a/src/consensus/meson.build b/src/consensus/meson.build
index b5fbe6971..03384c388 100644
--- a/src/consensus/meson.build
+++ b/src/consensus/meson.build
@@ -3,11 +3,13 @@ libgnunetconsensus_src = ['consensus_api.c']
 gnunetserviceconsensus_src = ['gnunet-service-consensus.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetconsensus = library('gnunetconsensus',
          libgnunetconsensus_src,
          dependencies: libgnunetutil_dep,
-          include_directories: [incdir, configuration_inc])
+          include_directories: [incdir, configuration_inc],
+          install: true,
+          install_dir: get_option('libdir'))
  libgnunetconsensus_dep = declare_dependency(link_with : libgnunetconsensus)
  executable ('gnunet-service-consensus',
              gnunetserviceconsensus_src,
@@ -15,7 +17,9 @@ if gnunet_monolith == false
                             libgnunetutil_dep,
                             libgnunetset_dep,
                             libgnunetstatistics_dep],
-              include_directories: [incdir, configuration_inc])
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('libdir') / 'gnunet' / 'libexec')
 else
  foreach p : libgnunetconsensus_src + gnunetserviceconsensus_src
    gnunet_src += 'consensus/' + p
diff --git a/src/core/meson.build b/src/core/meson.build
index f288294a3..142b3dac8 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -8,11 +8,13 @@ gnunetservicecore_src = ['gnunet-service-core.c',
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetcore = library('gnunetcore',
          libgnunetcore_src,
          dependencies: libgnunetutil_dep,
-          include_directories: [incdir, configuration_inc])
+          include_directories: [incdir, configuration_inc],
+          install: true,
+          install_dir: get_option('libdir'))
  libgnunetcore_dep = declare_dependency(link_with : libgnunetcore)
  executable ('gnunet-service-core',
              gnunetservicecore_src,
@@ -20,7 +22,9 @@ if gnunet_monolith == false
                             libgnunetstatistics_dep,
                             libgnunettransport_dep,
                             zlib_dep],
-              include_directories: [incdir, configuration_inc])
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('libdir') / 'gnunet' / 'libexec')
 else
  foreach p : libgnunetcore_src + gnunetservicecore_src
    gnunet_src += 'core/' + p
diff --git a/src/curl/meson.build b/src/curl/meson.build
index 5e7769d6d..b10d361d0 100644
--- a/src/curl/meson.build
+++ b/src/curl/meson.build
@@ -1,11 +1,13 @@
 libgnunetcurl_src = ['curl.c',
                    'curl_reschedule.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetcurl = library('gnunetcurl',
          libgnunetcurl_src,
          dependencies: [libgnunetutil_dep, curl_dep, json_dep],
-          include_directories: [incdir, configuration_inc])
+          include_directories: [incdir, configuration_inc],
+          install: true,
+          install_dir: get_option('libdir'))
  libgnunetcurl_dep = declare_dependency(link_with : libgnunetcurl)
 else
  foreach p : libgnunetcurl_src
diff --git a/src/datacache/meson.build b/src/datacache/meson.build
index 2f8305f42..045335a33 100644
--- a/src/datacache/meson.build
+++ b/src/datacache/meson.build
@@ -2,7 +2,7 @@ libgnunetdatacache_src = ['datacache.c']
 libgnunetplugindatacache_sqlite_src = ['plugin_datacache_sqlite.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetdatacache = library('gnunetdatacache',
          libgnunetdatacache_src,
          dependencies: [libgnunetutil_dep, libgnunetstatistics_dep],
diff --git a/src/datastore/meson.build b/src/datastore/meson.build
index e98e58dcf..9f9824530 100644
--- a/src/datastore/meson.build
+++ b/src/datastore/meson.build
@@ -3,7 +3,7 @@ libgnunetdatastore_src = ['datastore_api.c']
 gnunetservicedatastore_src = ['gnunet-service-datastore.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetdatastore = library('gnunetdatastore',
          libgnunetdatastore_src,
          dependencies: [libgnunetutil_dep,
diff --git a/src/dht/meson.build b/src/dht/meson.build
index 130cef644..86087f48d 100644
--- a/src/dht/meson.build
+++ b/src/dht/meson.build
@@ -8,7 +8,7 @@ gnunetservicedht_src = ['gnunet-service-dht.c',
                        'gnunet-service-dht_routing.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetdht = library('gnunetdht',
          libgnunetdht_src,
          dependencies: libgnunetutil_dep,
diff --git a/src/dhtu/meson.build b/src/dhtu/meson.build
index 2383f2524..24a5e01a1 100644
--- a/src/dhtu/meson.build
+++ b/src/dhtu/meson.build
@@ -2,7 +2,7 @@ libgnunetplugindhtuip_src = ['plugin_dhtu_ip.c']
 libgnunetplugindhtugnunet_src = ['plugin_dhtu_gnunet.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetplugindhtuip = library('gnunet_plugin_dhtu_ip',
          libgnunetplugindhtuip_src,
          dependencies: libgnunetutil_dep,
diff --git a/src/dns/meson.build b/src/dns/meson.build
index 2d59dbac3..8b68fd73a 100644
--- a/src/dns/meson.build
+++ b/src/dns/meson.build
@@ -6,7 +6,7 @@ gnunetdnsredirector_src = ['gnunet-dns-monitor.c']
 gnunetdnsmonitor_src = ['gnunet-dns-redirector.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetdns = library('gnunetdns',
          libgnunetdns_src,
          dependencies: libgnunetutil_dep,
@@ -31,7 +31,7 @@ if gnunet_monolith == false
              dependencies: [libgnunetdns_dep, libgnunetutil_dep, libgnunetdns_dep],
              include_directories: [incdir, configuration_inc])
 else
-  foreach p : libgnunetdns_src + gnunetservicedns_src + gnunetdnsmonitor_src + gnunetdnsredirector_src + libgnunetpluginblockdns_src
+  foreach p : libgnunetdns_src + gnunetservicedns_src + libgnunetpluginblockdns_src
    gnunet_src += 'dns/' + p
  endforeach
 endif
diff --git a/src/fragmentation/meson.build b/src/fragmentation/meson.build
index 244902574..97c054614 100644
--- a/src/fragmentation/meson.build
+++ b/src/fragmentation/meson.build
@@ -1,7 +1,7 @@
 libgnunetfragmentation_src = ['fragmentation.c',
                              'defragmentation.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetfragmentation = library('gnunetfragmentation',
          libgnunetfragmentation_src,
          dependencies: [libgnunetutil_dep, libgnunetstatistics_dep],
diff --git a/src/gns/meson.build b/src/gns/meson.build
index 1ee79c4c2..afbecbe64 100644
--- a/src/gns/meson.build
+++ b/src/gns/meson.build
@@ -5,13 +5,15 @@ gnunetservicegns_src = ['gnunet-service-gns.c',
                        'gnunet-service-gns_interceptor.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetgns = library('gnunetgns',
          libgnunetgns_src,
          dependencies: [libgnunetutil_dep,
                         libgnunetgnsrecord_dep,
                         libgnunetidentity_dep],
-          include_directories: [incdir, configuration_inc])
+          include_directories: [incdir, configuration_inc],
+          install: true,
+          install_dir: get_option('libdir'))
  libgnunetgns_dep = declare_dependency(link_with : libgnunetgns)
  executable ('gnunet-service-gns',
              gnunetservicegns_src,
@@ -28,7 +30,9 @@ if gnunet_monolith == false
                             libgnunetgnsrecord_dep,
                             libgnunetcadet_dep,
                             libgnunetblock_dep],
-              include_directories: [incdir, configuration_inc])
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('libdir') / 'gnunet' / 'libexec')
 else
  foreach p : libgnunetgns_src + gnunetservicegns_src
    gnunet_src += 'gns/' + p
diff --git a/src/gnsrecord/meson.build b/src/gnsrecord/meson.build
index 1a6b5e6ff..f98415ce5 100644
--- a/src/gnsrecord/meson.build
+++ b/src/gnsrecord/meson.build
@@ -4,7 +4,7 @@ libgnunetgnsrecord_src = ['gnsrecord.c',
                          'gnsrecord_misc.c']
 libgnunetgnsrecordjson_src = ['json_gnsrecord.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetgnsrecord = library('gnunetgnsrecord',
          libgnunetgnsrecord_src,
          dependencies: [libgnunetutil_dep,
diff --git a/src/hello/meson.build b/src/hello/meson.build
index 1e5fc4ff6..843531bb5 100644
--- a/src/hello/meson.build
+++ b/src/hello/meson.build
@@ -6,7 +6,7 @@ libgnunethello_src = ['hello.c',
 gnunethello_src = ['gnunet-hello.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunethello = library('gnunethello',
          libgnunethello_src,
          dependencies: libgnunetutil_dep,
@@ -17,7 +17,7 @@ if gnunet_monolith == false
              dependencies: [libgnunethello_dep, libgnunetutil_dep],
              include_directories: [incdir, configuration_inc])
 else
-  foreach p : libgnunethello_src + gnunethello_src
+  foreach p : libgnunethello_src
    gnunet_src += 'hello/' + p
  endforeach
 endif
diff --git a/src/hostlist/meson.build b/src/hostlist/meson.build
index 225f69359..605282fd5 100644
--- a/src/hostlist/meson.build
+++ b/src/hostlist/meson.build
@@ -3,7 +3,7 @@ gnunetdaemonhostlist_src = ['gnunet-daemon-hostlist.c',
                            'gnunet-daemon-hostlist_client.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  executable ('gnunet-daemon-hostlist',
              gnunetdaemonhostlist_src,
              dependencies: [libgnunetutil_dep,
@@ -16,7 +16,7 @@ if gnunet_monolith == false
                             curl_dep],
              include_directories: [incdir, configuration_inc])
 else
-  foreach p : gnunetdaemonhostlist_src
+  #foreach p : gnunetdaemonhostlist_src
-    gnunet_src += 'hostlist/' + p
+  #  gnunet_src += 'hostlist/' + p
-  endforeach
+  #endforeach
 endif
diff --git a/src/identity/meson.build b/src/identity/meson.build
index 7153fff7f..38adf6da5 100644
--- a/src/identity/meson.build
+++ b/src/identity/meson.build
@@ -5,7 +5,7 @@ libgnunetidentity_src = ['identity_api.c',
 gnunetserviceidentity_src = ['gnunet-service-identity.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetidentity = library('gnunetidentity',
          libgnunetidentity_src,
          dependencies: [libgnunetutil_dep, sodium_dep],
diff --git a/src/include/gnunet_service_lib.h b/src/include/gnunet_service_lib.h
index 7c6ce0c0e..3ebfae581 100644
--- a/src/include/gnunet_service_lib.h
+++ b/src/include/gnunet_service_lib.h
@@ -314,6 +314,7 @@ GNUNET_SERVICE_run_ (int argc,
 *  GNUNET_MQ_handler_end ());
 * </code>
 */
+#ifndef HAVE_GNUNET_MONOLITH
 #define GNUNET_SERVICE_MAIN(service_name, service_options, init_cb, connect_cb, \
                            disconnect_cb, cls, ...) \
  int \
@@ -333,7 +334,10 @@ GNUNET_SERVICE_run_ (int argc,
                                cls, \
                                mh); \
  }
+#else
+#define GNUNET_SERVICE_MAIN(service_name, service_options, init_cb, connect_cb, \
+                            disconnect_cb, cls, ...)
+#endif
 /**
 * Suspend accepting connections from the listen socket temporarily.
diff --git a/src/json/meson.build b/src/json/meson.build
index ca010ada6..769e9d4cf 100644
--- a/src/json/meson.build
+++ b/src/json/meson.build
@@ -4,7 +4,7 @@ libgnunetjson_src = ['json.c',
                    'json_mhd.c',
                    'json_pack.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetjson = library('gnunetjson',
          libgnunetjson_src,
          dependencies: [libgnunetutil_dep, json_dep, mhd_dep, zlib_dep],
diff --git a/src/meson.build b/src/meson.build
index e66ce696b..5ab5b7063 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,4 +1,4 @@
-if gnunet_monolith == true
+if get_option('monolith') == true
  gnunet_src = []
 endif
@@ -7,7 +7,9 @@ subdir('util')
 subdir('nt')
 subdir('hello')
 subdir('block')
-subdir('arm')
+if get_option('monolith') == false
+  subdir('arm')
+endif
 subdir('statistics')
 #$(TESTING)')
 if json_dep.found()
@@ -16,7 +18,9 @@ endif
 if curl_dep.found()
  subdir('curl')
 endif
-subdir('rest')
+if get_option('monolith') == false
+  subdir('rest')
+endif
 subdir('peerinfo')
 if sqlite_dep.found()
  subdir('sq')
@@ -48,7 +52,7 @@ subdir('namecache')
 subdir('namestore')
 subdir('peerinfo-tool')
 subdir('cadet')
-subdir('set')
+#subdir('set')
 subdir('seti')
 subdir('setu')
 subdir('consensus')
@@ -67,7 +71,7 @@ subdir('zonemaster')
 ##subdir('$(EXP_DIR)')
 #subdir('integration-tests')
-if gnunet_monolith == true
+if get_option('monolith')
  libgnunet = library('gnunet',
                      gnunet_src,
                      dependencies: gnunetdeps,
diff --git a/src/namecache/meson.build b/src/namecache/meson.build
index 87e01d531..f5bb63204 100644
--- a/src/namecache/meson.build
+++ b/src/namecache/meson.build
@@ -5,7 +5,7 @@ gnunetnamecache_src = ['gnunet-namecache.c']
 gnunetservicenamecache_src = ['gnunet-service-namecache.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetnamecache = library('gnunetnamecache',
          libgnunetnamecache_src,
          dependencies: [libgnunetutil_dep,
@@ -35,7 +35,7 @@ if gnunet_monolith == false
                             libgnunetstatistics_dep],
              include_directories: [incdir, configuration_inc])
 else
-  foreach p : libgnunetnamecache_src + libgnunetpluginnamecache_sqlite_src + gnunetservicenamecache_src + gnunetnamecache_src
+  foreach p : libgnunetnamecache_src + libgnunetpluginnamecache_sqlite_src + gnunetservicenamecache_src
    gnunet_src += 'namecache/' + p
  endforeach
 endif
diff --git a/src/namestore/meson.build b/src/namestore/meson.build
index 9241737ca..c3df2a621 100644
--- a/src/namestore/meson.build
+++ b/src/namestore/meson.build
@@ -5,7 +5,7 @@ gnunetnamestore_src = ['gnunet-namestore.c']
 gnunetservicenamestore_src = ['gnunet-service-namestore.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetnamestore = library('gnunetnamestore',
          libgnunetnamestore_src,
          dependencies: [libgnunetutil_dep,
@@ -40,7 +40,7 @@ if gnunet_monolith == false
                             libgnunetstatistics_dep],
              include_directories: [incdir, configuration_inc])
 else
-  foreach p : libgnunetnamestore_src + libgnunetpluginnamestore_sqlite_src + gnunetservicenamestore_src + gnunetnamestore_src
+  foreach p : libgnunetnamestore_src + libgnunetpluginnamestore_sqlite_src + gnunetservicenamestore_src
    gnunet_src += 'namestore/' + p
  endforeach
 endif
diff --git a/src/nat-auto/meson.build b/src/nat-auto/meson.build
index d3441cc65..e5643cc58 100644
--- a/src/nat-auto/meson.build
+++ b/src/nat-auto/meson.build
@@ -4,7 +4,7 @@ libgnunetnatauto_src = ['nat_auto_api.c',
 gnunetservicenatauto_src = ['gnunet-nat-server.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetnatauto = library('gnunetnatauto',
          libgnunetnatauto_src,
          dependencies: [libgnunetutil_dep, libgnunetnat_dep],
diff --git a/src/nat/meson.build b/src/nat/meson.build
index 5a0e7622f..48916af9f 100644
--- a/src/nat/meson.build
+++ b/src/nat/meson.build
@@ -8,7 +8,7 @@ gnunetservicenat_src = ['gnunet-service-nat.c',
                        'gnunet-service-nat_mini.c',
                        'gnunet-service-nat_helper.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetnat = library('gnunetnat',
          libgnunetnat_src,
          dependencies: libgnunetutil_dep,
diff --git a/src/nse/meson.build b/src/nse/meson.build
index f0e0dfa2e..9f1111af6 100644
--- a/src/nse/meson.build
+++ b/src/nse/meson.build
@@ -2,7 +2,7 @@ libgnunetnse_src = ['nse_api.c']
 gnunetservicense_src = ['gnunet-service-nse.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetnse = library('gnunetnse',
          libgnunetnse_src,
          dependencies: libgnunetutil_dep,
diff --git a/src/nt/meson.build b/src/nt/meson.build
index 17c7e1e9d..981e1587d 100644
--- a/src/nt/meson.build
+++ b/src/nt/meson.build
@@ -1,6 +1,6 @@
 libgnunetnt_src = ['nt.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetnt = library('gnunetnt',
          libgnunetnt_src,
          dependencies: libgnunetutil_dep,
diff --git a/src/peerinfo-tool/meson.build b/src/peerinfo-tool/meson.build
index 0ffcfb099..a16e9bcf0 100644
--- a/src/peerinfo-tool/meson.build
+++ b/src/peerinfo-tool/meson.build
@@ -1,7 +1,7 @@
 gnunetpeerinfotool_src = ['gnunet-peerinfo.c', 'gnunet-peerinfo_plugins.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  executable ('gnunet-peerinfo',
              gnunetpeerinfotool_src,
              dependencies: [libgnunetutil_dep,
diff --git a/src/peerinfo/meson.build b/src/peerinfo/meson.build
index 2760023f7..fdcd38a61 100644
--- a/src/peerinfo/meson.build
+++ b/src/peerinfo/meson.build
@@ -4,7 +4,7 @@ libgnunetpeerinfo_src = ['peerinfo_api.c',
 gnunetservicepeerinfo_src = ['gnunet-service-peerinfo.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetpeerinfo = library('gnunetpeerinfo',
          libgnunetpeerinfo_src,
          dependencies: [libgnunetutil_dep, libgnunethello_dep],
diff --git a/src/peerstore/meson.build b/src/peerstore/meson.build
index fbaf791a2..0286a148c 100644
--- a/src/peerstore/meson.build
+++ b/src/peerstore/meson.build
@@ -4,7 +4,7 @@ libgnunetpeerstore_src = ['peerstore_api.c',
 gnunetservicepeerstore_src = ['gnunet-service-peerstore.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetpeerstore = library('gnunetpeerstore',
          libgnunetpeerstore_src,
          dependencies: libgnunetutil_dep,
diff --git a/src/regex/meson.build b/src/regex/meson.build
index 48289e7b5..64c284558 100644
--- a/src/regex/meson.build
+++ b/src/regex/meson.build
@@ -7,7 +7,7 @@ gnunetserviceregex_src = ['gnunet-service-regex.c',
                          'regex_internal.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetregex = library('gnunetregex',
          libgnunetregex_src,
          dependencies: libgnunetutil_dep,
diff --git a/src/rest/meson.build b/src/rest/meson.build
index f994e0a3e..19575233a 100644
--- a/src/rest/meson.build
+++ b/src/rest/meson.build
@@ -3,7 +3,7 @@ libgnunetrest_src = ['rest.c']
 gnunetservicerest_src = ['gnunet-rest-server.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetrest = library('gnunetrest',
          libgnunetrest_src,
          dependencies: [libgnunetutil_dep, mhd_dep],
diff --git a/src/revocation/meson.build b/src/revocation/meson.build
index 33dcab90b..843633289 100644
--- a/src/revocation/meson.build
+++ b/src/revocation/meson.build
@@ -3,7 +3,7 @@ libgnunetrevocation_src = ['revocation_api.c']
 gnunetservicerevocation_src = ['gnunet-service-revocation.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetrevocation = library('gnunetrevocation',
          libgnunetrevocation_src,
          dependencies: [libgnunetutil_dep, libgnunetidentity_dep],
diff --git a/src/scalarproduct/meson.build b/src/scalarproduct/meson.build
index 7dc8bd89b..80b85ae80 100644
--- a/src/scalarproduct/meson.build
+++ b/src/scalarproduct/meson.build
@@ -7,7 +7,7 @@ gnunetservicescalarproduct_src = ['gnunet-service-scalarproduct.c',
                        'ibf.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetscalarproduct = library('gnunetscalarproduct',
          libgnunetscalarproduct_src,
          dependencies: libgnunetutil_dep,
diff --git a/src/set/meson.build b/src/set/meson.build
index 77ff86718..da97ef7b4 100644
--- a/src/set/meson.build
+++ b/src/set/meson.build
@@ -7,7 +7,7 @@ gnunetserviceset_src = ['gnunet-service-set.c',
                        'ibf.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetset = library('gnunetset',
          libgnunetset_src,
          dependencies: libgnunetutil_dep,
diff --git a/src/seti/meson.build b/src/seti/meson.build
index 36311da2f..d913e26de 100644
--- a/src/seti/meson.build
+++ b/src/seti/meson.build
@@ -3,7 +3,7 @@ libgnunetseti_src = ['seti_api.c']
 gnunetserviceseti_src = ['gnunet-service-seti.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetseti = library('gnunetseti',
          libgnunetseti_src,
          dependencies: libgnunetutil_dep,
diff --git a/src/setu/meson.build b/src/setu/meson.build
index f4c3cea4e..2d867c32e 100644
--- a/src/setu/meson.build
+++ b/src/setu/meson.build
@@ -5,7 +5,7 @@ gnunetservicesetu_src = ['gnunet-service-setu.c',
                         'gnunet-service-setu_strata_estimator.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetsetu = library('gnunetsetu',
          libgnunetsetu_src,
          dependencies: libgnunetutil_dep,
diff --git a/src/sq/meson.build b/src/sq/meson.build
index b995b54a4..4199acb9f 100644
--- a/src/sq/meson.build
+++ b/src/sq/meson.build
@@ -4,7 +4,7 @@ libgnunetsq_src = ['sq.c',
                   'sq_query_helper.c',
                   'sq_result_helper.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetsq = library('gnunetsq',
          libgnunetsq_src,
          dependencies: [libgnunetutil_dep, sqlite_dep],
diff --git a/src/statistics/meson.build b/src/statistics/meson.build
index 78d8c1e3e..f0bed324e 100644
--- a/src/statistics/meson.build
+++ b/src/statistics/meson.build
@@ -3,7 +3,7 @@ libgnunetstatistics_src = ['statistics_api.c']
 gnunetservicestatistics_src = ['gnunet-service-statistics.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetstatistics = library('gnunetstatistics',
          libgnunetstatistics_src,
          dependencies: libgnunetutil_dep,
diff --git a/src/topology/meson.build b/src/topology/meson.build
index a4f42027c..2f1db3641 100644
--- a/src/topology/meson.build
+++ b/src/topology/meson.build
@@ -3,7 +3,7 @@ libgnunetfriends_src = ['friends.c']
 gnunetdaemontopology_src = ['gnunet-daemon-topology.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetfriends = library('gnunetfriends',
          libgnunetfriends_src,
          dependencies: libgnunetutil_dep,
@@ -21,7 +21,7 @@ if gnunet_monolith == false
                             libgnunethello_dep],
              include_directories: [incdir, configuration_inc])
 else
-  foreach p : libgnunetfriends_src + gnunetdaemontopology_src
+  foreach p : libgnunetfriends_src
    gnunet_src += 'topology/' + p
  endforeach
 endif
diff --git a/src/transport/meson.build b/src/transport/meson.build
index 09e6c35a3..6774f539e 100644
--- a/src/transport/meson.build
+++ b/src/transport/meson.build
@@ -16,7 +16,7 @@ gnunetcommunicatortcp_src = ['gnunet-communicator-tcp.c']
 gnunetcommunicatorudp_src = ['gnunet-communicator-udp.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunettransport = library('gnunettransport',
          libgnunettransport_src,
          dependencies: [libgnunetutil_dep, libgnunetats_dep, libgnunethello_dep],
diff --git a/src/util/meson.build b/src/util/meson.build
index 4d677a7b2..fdb4e295f 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -69,7 +69,7 @@ libgnunetutil_src = ['bandwidth.c',
       'proc_compat.c',
             'gnunet_error_codes.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetutil = library('gnunetutil',
          libgnunetutil_src,
          dependencies: gnunetdeps,
diff --git a/src/vpn/meson.build b/src/vpn/meson.build
index 62054224b..c827b7e91 100644
--- a/src/vpn/meson.build
+++ b/src/vpn/meson.build
@@ -4,7 +4,7 @@ gnunetservicevpn_src = ['gnunet-service-vpn.c']
 exitdir = include_directories('../exit')
-if gnunet_monolith == false
+if get_option('monolith') == false
  libgnunetvpn = library('gnunetvpn',
          libgnunetvpn_src,
          dependencies: libgnunetutil_dep,
diff --git a/src/zonemaster/meson.build b/src/zonemaster/meson.build
index 35208f221..885bd2cd4 100644
--- a/src/zonemaster/meson.build
+++ b/src/zonemaster/meson.build
@@ -1,7 +1,7 @@
 gnunetservicezonemaster_src = ['gnunet-service-zonemaster.c']
-if gnunet_monolith == false
+if get_option('monolith') == false
  executable ('gnunet-service-zonemaster',
              gnunetservicezonemaster_src,
              dependencies: [