NEWS: mention ConditionSecurity=uefi-secureboot

[elogind.git] / meson.build

diff --git a/meson.build b/meson.build
index c8eff6dcea5872dd95e6eac7aa57c20ceeb49d24..b176232ebb5eb761ca7d31ad7ee6e4042d760768 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright 2017 Zbigniew Jędrzejewski-Szmek
 
 project('elogind', 'c',
         version : '238',
@@ -369,7 +367,6 @@ endif
 #         '-Wold-style-definition',
 #         '-Wpointer-arith',
 #         '-Winit-self',
-#         '-Wdeclaration-after-statement',
 #         '-Wfloat-equal',
 #         '-Wsuggest-attribute=noreturn',
 #         '-Werror=missing-prototypes',
@@ -387,6 +384,8 @@ endif
 #         '-Wstrict-aliasing=2',
 #         '-Wwrite-strings',
 #         '-Werror=overflow',
+#         '-Werror=shift-count-overflow',
+#         '-Werror=shift-overflow=2',
 #         '-Wdate-time',
 #         '-Wnested-externs',
 #         '-ffast-math',
@@ -435,7 +434,7 @@ endif
 add_project_arguments(cc.get_supported_arguments(possible_cc_flags), language : 'c')
 
 # "negative" arguments: gcc on purpose does not return an error for "-Wno-"
-# arguments, just emits a warnings. So test for the "positive" version instead.
+# arguments, just emits a warning. So test for the "positive" version instead.
 foreach arg : ['unused-parameter',
                'missing-field-initializers',
                'unused-result',
@@ -1299,6 +1298,29 @@ conf.set10('HAVE_DBUS', have)
 #          'DNSSEC_' + default_dnssec.underscorify().to_upper())
 # substs.set('DEFAULT_DNSSEC_MODE', default_dnssec)
 # 
+# dns_over_tls = get_option('dns-over-tls')
+# if dns_over_tls != 'false'
+#         have = conf.get('HAVE_GNUTLS') == 1
+#         if dns_over_tls == 'true' and not have
+#                 error('DNS-over-TLS support was requested, but dependencies are not available')
+#         endif
+# else
+#         have = false
+# endif
+# conf.set10('ENABLE_DNS_OVER_TLS', have)
+# 
+# default_dns_over_tls = get_option('default-dns-over-tls')
+# if fuzzer_build
+#         default_dns_over_tls = 'no'
+# endif
+# if default_dns_over_tls != 'no' and conf.get('ENABLE_DNS_OVER_TLS') == 0
+#         message('default-dns-over-tls cannot be set to opportunistic when DNS-over-TLS support is disabled. Setting default-dns-over-tls to no.')
+#         default_dns_over_tls = 'no'
+# endif
+# conf.set('DEFAULT_DNS_OVER_TLS_MODE',
+#          'DNS_OVER_TLS_' + default_dns_over_tls.underscorify().to_upper())
+# substs.set('DEFAULT_DNS_OVER_TLS_MODE', default_dns_over_tls)
+# 
 # want_importd = get_option('importd')
 # if want_importd != 'false'
 #         have = (conf.get('HAVE_LIBCURL') == 1 and
@@ -1429,6 +1451,8 @@ includes = include_directories('src/basic',
                                'src/systemd',
 #if 0 /// UNNEEDED by elogind
 #                                'src/journal',
+#                                'src/journal-remote',
+#                                'src/nspawn',
 #                                'src/resolve',
 #                                'src/timesync',
 #endif // 0
@@ -1792,10 +1816,7 @@ test_dlopen = executable(
 #                    link_with : [libshared,
 #                                 libbasic_gcrypt,
 #                                 libsystemd_resolve_core],
-#                    dependencies : [threads,
-#                                    libgpg_error,
-#                                    libm,
-#                                    libidn],
+#                    dependencies : systemd_resolved_dependencies,
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
@@ -1921,6 +1942,18 @@ executable('elogind-user-runtime-dir',
 executable('elogind-user-runtime-dir',
 executable('elogind-user-runtime-dir',
 executable('elogind-user-runtime-dir',
+executable('elogind-user-runtime-dir',
+executable('elogind-user-runtime-dir',
+executable('elogind-user-runtime-dir',
+executable('elogind-user-runtime-dir',
+executable('elogind-user-runtime-dir',
+executable('elogind-user-runtime-dir',
+executable('elogind-user-runtime-dir',
+executable('elogind-user-runtime-dir',
+executable('elogind-user-runtime-dir',
+executable('elogind-user-runtime-dir',
+executable('elogind-user-runtime-dir',
+executable('elogind-user-runtime-dir',
 executable('elogind-user-runtime-dir',
            user_runtime_dir_sources,
            include_directories : includes,
@@ -1981,9 +2014,19 @@ endif
 #                  install : true)
 # public_programs += [exe]
 # 
+# 
+# if get_option('link-systemctl-shared')
+#         systemctl_link_with = [libshared]
+# else
+#         systemctl_link_with = [libsystemd_static,
+#                                libshared_static,
+#                                libjournal_client,
+#                                libbasic_gcrypt]
+# endif
+# 
 # exe = executable('systemctl', 'src/systemctl/systemctl.c',
 #                  include_directories : includes,
-#                  link_with : [libshared],
+#                  link_with : systemctl_link_with,
 #                  dependencies : [threads,
 #                                  libcap,
 #                                  libselinux,
@@ -2281,7 +2324,8 @@ endif
 #         s_j_remote = executable('systemd-journal-remote',
 #                                 systemd_journal_remote_sources,
 #                                 include_directories : includes,
-#                                 link_with : [libshared],
+#                                 link_with : [libshared,
+#                                              libsystemd_journal_remote],
 #                                 dependencies : [threads,
 #                                                 libmicrohttpd,
 #                                                 libgnutls,
@@ -2746,12 +2790,10 @@ executable('elogind-cgroups-agent',
 #                  'src/core/mount-setup.h',
 #                  'src/core/loopback-setup.c',
 #                  'src/core/loopback-setup.h',
-#                  include_directories : [includes, include_directories('src/nspawn')],
-#                  link_with : [libshared],
-#                  dependencies : [libacl,
-#                                  libblkid,
-#                                  libseccomp,
-#                                  libselinux],
+#                  include_directories : includes,
+#                  link_with : [libnspawn_core,
+#                               libshared],
+#                  dependencies : [libblkid],
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
@@ -3182,6 +3224,7 @@ status = [
 #         'symbolic gateway hostnames:        @0@'.format(', '.join(gateway_hostnames)),
 # 
 #         'default DNSSEC mode:               @0@'.format(default_dnssec),
+#         'default DNS-over-TLS mode:         @0@'.format(default_dns_over_tls),
 #         'default cgroup hierarchy:          @0@'.format(default_hierarchy),
 #endif // 0
         'default KillUserProcesses setting: @0@'.format(kill_user_processes)]
@@ -3277,6 +3320,7 @@ foreach tuple : [
 #         ['localed'],
 #         ['networkd'],
 #         ['resolve'],
+#         ['DNS-over-TLS'],
 #         ['coredump'],
 #endif // 0
         ['polkit'],