tree-wide: drop !! casts to booleans

[elogind.git] / meson.build

diff --git a/meson.build b/meson.build
index 780abcc6bbc22e1663120fdadd74389229b545bb..b7326427b549bcc66460b00d217dc4c93a1b9cc1 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -164,6 +164,7 @@ modprobedir = join_paths(rootprefixdir, 'lib/modprobe.d')
 # systemdstatedir = join_paths(localstatedir, 'lib/systemd')
 # catalogstatedir = join_paths(systemdstatedir, 'catalog')
 # randomseeddir = join_paths(localstatedir, 'lib/systemd')
+# profiledir = join_paths(rootlibexecdir, 'portable', 'profile')
 # 
 # docdir = get_option('docdir')
 # if docdir == ''
@@ -368,7 +369,6 @@ endif
 #         '-Wold-style-definition',
 #         '-Wpointer-arith',
 #         '-Winit-self',
-#         '-Wdeclaration-after-statement',
 #         '-Wfloat-equal',
 #         '-Wsuggest-attribute=noreturn',
 #         '-Werror=missing-prototypes',
@@ -386,6 +386,8 @@ endif
 #         '-Wstrict-aliasing=2',
 #         '-Wwrite-strings',
 #         '-Werror=overflow',
+#         '-Werror=shift-count-overflow',
+#         '-Werror=shift-overflow=2',
 #         '-Wdate-time',
 #         '-Wnested-externs',
 #         '-ffast-math',
@@ -434,7 +436,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',
@@ -1298,6 +1300,18 @@ conf.set10('HAVE_DBUS', have)
 #          'DNSSEC_' + default_dnssec.underscorify().to_upper())
 # substs.set('DEFAULT_DNSSEC_MODE', default_dnssec)
 # 
+# default_private_dns = get_option('default-private-dns')
+# if fuzzer_build
+#         default_private_dns = 'no'
+# endif
+# if default_private_dns != 'no' and conf.get('HAVE_GNUTLS') == 0
+#         message('default-private-dns cannot be set to strict or opportunistic when gnutls is disabled. Setting default-private-dns to no.')
+#         default_private_dns = 'no'
+# endif
+# conf.set('DEFAULT_PRIVATE_DNS_MODE',
+#          'PRIVATE_DNS_' + default_private_dns.underscorify().to_upper())
+# substs.set('DEFAULT_PRIVATE_DNS_MODE', default_private_dns)
+# 
 # want_importd = get_option('importd')
 # if want_importd != 'false'
 #         have = (conf.get('HAVE_LIBCURL') == 1 and
@@ -1342,6 +1356,7 @@ foreach term : ['utmp',
 #                 'hostnamed',
 #                 'localed',
 #                 'machined',
+#                 'portabled',
 #                 'networkd',
 #                 'timedated',
 #                 'timesyncd',
@@ -1427,6 +1442,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
@@ -1560,6 +1577,7 @@ subdir('src/shared')
 # subdir('src/kernel-install')
 # subdir('src/locale')
 # subdir('src/machine')
+# subdir('src/portable')
 # subdir('src/nspawn')
 # subdir('src/resolve')
 # subdir('src/timedate')
@@ -1790,6 +1808,7 @@ test_dlopen = executable(
 #                                 libbasic_gcrypt,
 #                                 libsystemd_resolve_core],
 #                    dependencies : [threads,
+#                                    libgnutls,
 #                                    libgpg_error,
 #                                    libm,
 #                                    libidn],
@@ -1917,6 +1936,15 @@ 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,
@@ -1977,9 +2005,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,
@@ -1990,6 +2028,26 @@ endif
 #                  install_dir : rootbindir)
 # public_programs += [exe]
 # 
+# if conf.get('ENABLE_PORTABLED') == 1
+#         executable('systemd-portabled',
+#                    systemd_portabled_sources,
+#                    include_directories : includes,
+#                    link_with : [libshared],
+#                    dependencies : [threads],
+#                    install_rpath : rootlibexecdir,
+#                    install : true,
+#                    install_dir : rootlibexecdir)
+# 
+#         exe = executable('portablectl', 'src/portable/portablectl.c',
+#                          include_directories : includes,
+#                          link_with : [libshared],
+#                          dependencies : [threads],
+#                          install_rpath : rootlibexecdir,
+#                          install : true,
+#                          install_dir : rootlibexecdir)
+#         public_programs += [exe]
+# endif
+# 
 # foreach alias : ['halt', 'poweroff', 'reboot', 'runlevel', 'shutdown', 'telinit']
 #         meson.add_install_script(meson_make_symlink,
 #                                  join_paths(rootbindir, 'systemctl'),
@@ -2257,7 +2315,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,
@@ -2722,12 +2781,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]
@@ -3057,9 +3114,8 @@ if git.found()
                 'tags',
                 output : 'tags',
                 command : [env, 'etags', '-o', '@0@/TAGS'.format(meson.current_source_dir())] + all_files)
-        custom_target(
+        run_target(
                 'ctags',
-                output : 'ctags',
                 command : [env, 'ctags', '-o', '@0@/tags'.format(meson.current_source_dir())] + all_files)
 endif
 
@@ -3159,6 +3215,7 @@ status = [
 #         'symbolic gateway hostnames:        @0@'.format(', '.join(gateway_hostnames)),
 # 
 #         'default DNSSEC mode:               @0@'.format(default_dnssec),
+#         'default private DNS mode:          @0@'.format(default_private_dns),
 #         'default cgroup hierarchy:          @0@'.format(default_hierarchy),
 #endif // 0
         'default KillUserProcesses setting: @0@'.format(kill_user_processes)]
@@ -3246,6 +3303,7 @@ foreach tuple : [
 #         ['rfkill'],
 #         ['logind'],
 #         ['machined'],
+#         ['portabled'],
 #         ['importd'],
 #         ['hostnamed'],
 #         ['timedated'],