meson: use jinja2 for src/resolve/

diff --git a/meson.build b/meson.build
index 3310f3bef251366dd4cec3adfc6f894b7519ce29..10497621c40816ea3ec0331b0647e556daa67934 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1425,6 +1425,7 @@ if default_dnssec != 'no' and conf.get('HAVE_GCRYPT') == 0
 endif
 conf.set('DEFAULT_DNSSEC_MODE',
          'DNSSEC_' + default_dnssec.underscorify().to_upper())
+conf.set_quoted('DEFAULT_DNSSEC_MODE_STR', default_dnssec)
 substs.set('DEFAULT_DNSSEC_MODE', default_dnssec)
 
 dns_over_tls = get_option('dns-over-tls')
@@ -1466,16 +1467,19 @@ if default_dns_over_tls != 'no' and conf.get('ENABLE_DNS_OVER_TLS') == 0
 endif
 conf.set('DEFAULT_DNS_OVER_TLS_MODE',
          'DNS_OVER_TLS_' + default_dns_over_tls.underscorify().to_upper())
+conf.set_quoted('DEFAULT_DNS_OVER_TLS_MODE_STR', default_dns_over_tls)
 substs.set('DEFAULT_DNS_OVER_TLS_MODE', default_dns_over_tls)
 
 default_mdns = get_option('default-mdns')
 conf.set('DEFAULT_MDNS_MODE',
          'RESOLVE_SUPPORT_' + default_mdns.to_upper())
+conf.set_quoted('DEFAULT_MDNS_MODE_STR', default_mdns)
 substs.set('DEFAULT_MDNS_MODE', default_mdns)
 
 default_llmnr = get_option('default-llmnr')
 conf.set('DEFAULT_LLMNR_MODE',
          'RESOLVE_SUPPORT_' + default_llmnr.to_upper())
+conf.set_quoted('DEFAULT_LLMNR_MODE_STR', default_llmnr)
 substs.set('DEFAULT_LLMNR_MODE', default_llmnr)
 
 want_repart = get_option('repart')

diff --git a/src/resolve/meson.build b/src/resolve/meson.build
index b1d97736a3f16c278b42402843125a1360938323..1f9b8af4f3fcbf2e93fb89db88e6fe50453788d2 100644 (file)
--- a/src/resolve/meson.build
+++ b/src/resolve/meson.build
@@ -158,20 +158,19 @@ if conf.get('ENABLE_RESOLVE') == 1
                      install_dir : dbussystemservicedir)
         install_data('org.freedesktop.resolve1.policy',
                      install_dir : polkitpolicydir)
-
-        resolved_conf = configure_file(
-                input : 'resolved.conf.in',
-                output : 'resolved.conf',
-                configuration : substs)
-        if install_sysconfdir_samples
-                install_data(resolved_conf,
-                             install_dir : pkgsysconfdir)
-        endif
-
         install_data('resolv.conf',
                      install_dir : rootlibexecdir)
 endif
 
+custom_target(
+        'resolved.conf',
+        input : 'resolved.conf.in',
+        output : 'resolved.conf',
+        command : [meson_render_jinja2, config_h, '@INPUT@'],
+        capture : true,
+        install : conf.get('ENABLE_RESOLVE') == 1 and install_sysconfdir_samples,
+        install_dir : pkgsysconfdir)
+
 ############################################################
 
 tests += [

diff --git a/src/resolve/resolved.conf.in b/src/resolve/resolved.conf.in
index 4f3421dd4bbecc83c7787d6e8dbccbd391521939..6d4176df525d7db1ac8197b67b1abab878397c49 100644 (file)
--- a/src/resolve/resolved.conf.in
+++ b/src/resolve/resolved.conf.in
@@ -20,12 +20,12 @@
 # Google:     8.8.8.8#dns.google 8.8.4.4#dns.google 2001:4860:4860::8888#dns.google 2001:4860:4860::8844#dns.google
 # Quad9:      9.9.9.9#dns.quad9.net 149.112.112.112#dns.quad9.net 2620:fe::fe#dns.quad9.net 2620:fe::9#dns.quad9.net
 #DNS=
-#FallbackDNS=@DNS_SERVERS@
+#FallbackDNS={{DNS_SERVERS}}
 #Domains=
-#DNSSEC=@DEFAULT_DNSSEC_MODE@
-#DNSOverTLS=@DEFAULT_DNS_OVER_TLS_MODE@
-#MulticastDNS=@DEFAULT_MDNS_MODE@
-#LLMNR=@DEFAULT_LLMNR_MODE@
+#DNSSEC={{DEFAULT_DNSSEC_MODE_STR}}
+#DNSOverTLS={{DEFAULT_DNS_OVER_TLS_MODE_STR}}
+#MulticastDNS={{DEFAULT_MDNS_MODE_STR}}
+#LLMNR={{DEFAULT_LLMNR_MODE_STR}}
 #Cache=yes
 #CacheFromLocalhost=no
 #DNSStubListener=yes