build-sys: s/ENABLE_RESOLVED/ENABLE_RESOLVE/

The configuration option was called -Dresolve, but the internal define
was …RESOLVED. This options governs more than just resolved itself, so
let's settle on the version without "d".

diff --git a/man/dnssec-trust-anchors.d.xml b/man/dnssec-trust-anchors.d.xml
index 9a28862ceb2b2b9ddc92cc607667c0a055fe4835..6e90e6aef91f119d29464be0bf1770208c133087 100644 (file)
--- a/man/dnssec-trust-anchors.d.xml
+++ b/man/dnssec-trust-anchors.d.xml
@@ -21,7 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="dnssec-trust-anchors.d" conditional='ENABLE_RESOLVED'
+<refentry id="dnssec-trust-anchors.d" conditional='ENABLE_RESOLVE'
     xmlns:xi="http://www.w3.org/2001/XInclude">
   <refentryinfo>
     <title>dnssec-trust-anchors.d</title>

diff --git a/man/nss-resolve.xml b/man/nss-resolve.xml
index 3a4e98e88f9c020c844651bcd48c1ce8eb0d2f01..f88c25c4538236e2e2f5bfaef62d6bcc79f60d48 100644 (file)
--- a/man/nss-resolve.xml
+++ b/man/nss-resolve.xml
@@ -22,7 +22,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="nss-resolve" conditional='ENABLE_RESOLVED'>
+<refentry id="nss-resolve" conditional='ENABLE_RESOLVE'>
 
   <refentryinfo>
     <title>nss-resolve</title>

diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml
index 7babc5c5c41df64f20c78c42d9f6d5775cd757de..1846df7502a4979a73eb8f81a811bf8991540310 100644 (file)
--- a/man/resolved.conf.xml
+++ b/man/resolved.conf.xml
@@ -21,7 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="resolved.conf" conditional='ENABLE_RESOLVED'
+<refentry id="resolved.conf" conditional='ENABLE_RESOLVE'
     xmlns:xi="http://www.w3.org/2001/XInclude">
   <refentryinfo>
     <title>resolved.conf</title>

diff --git a/man/rules/meson.build b/man/rules/meson.build
index 6112d337e1a996a1c27218caf0ab1cfde6a9795e..ae0556058e6e9f66984fb28cd897e5787e7110d9 100644 (file)
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -11,7 +11,7 @@ manpages = [
  ['dnssec-trust-anchors.d',
   '5',
   ['systemd.negative', 'systemd.positive'],
-  'ENABLE_RESOLVED'],
+  'ENABLE_RESOLVE'],
  ['environment.d', '5', [], 'ENABLE_ENVIRONMENT_D'],
  ['file-hierarchy', '7', [], ''],
  ['halt', '8', ['poweroff', 'reboot'], ''],
@@ -38,11 +38,11 @@ manpages = [
  ['networkd.conf', '5', ['networkd.conf.d'], 'ENABLE_NETWORKD'],
  ['nss-myhostname', '8', ['libnss_myhostname.so.2'], 'ENABLE_MYHOSTNAME'],
  ['nss-mymachines', '8', ['libnss_mymachines.so.2'], 'ENABLE_MACHINED'],
- ['nss-resolve', '8', ['libnss_resolve.so.2'], 'ENABLE_RESOLVED'],
+ ['nss-resolve', '8', ['libnss_resolve.so.2'], 'ENABLE_RESOLVE'],
  ['nss-systemd', '8', ['libnss_systemd.so.2'], 'ENABLE_NSS_SYSTEMD'],
  ['os-release', '5', [], ''],
  ['pam_systemd', '8', [], 'HAVE_PAM'],
- ['resolved.conf', '5', ['resolved.conf.d'], 'ENABLE_RESOLVED'],
+ ['resolved.conf', '5', ['resolved.conf.d'], 'ENABLE_RESOLVE'],
  ['runlevel', '8', [], 'ENABLE_UTMP'],
  ['sd-bus-errors',
   '3',
@@ -588,8 +588,8 @@ manpages = [
   ['systemd-random-seed'],
   'ENABLE_RANDOMSEED'],
  ['systemd-remount-fs.service', '8', ['systemd-remount-fs'], ''],
- ['systemd-resolve', '1', [], 'ENABLE_RESOLVED'],
- ['systemd-resolved.service', '8', ['systemd-resolved'], 'ENABLE_RESOLVED'],
+ ['systemd-resolve', '1', [], 'ENABLE_RESOLVE'],
+ ['systemd-resolved.service', '8', ['systemd-resolved'], 'ENABLE_RESOLVE'],
  ['systemd-rfkill.service',
   '8',
   ['systemd-rfkill', 'systemd-rfkill.socket'],

diff --git a/man/systemd-resolve.xml b/man/systemd-resolve.xml
index e3ef26bb81e174eaa497869406f475b85804123e..47c90f2e482ae7a21a21ab73958996268b1415f0 100644 (file)
--- a/man/systemd-resolve.xml
+++ b/man/systemd-resolve.xml
@@ -21,7 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="systemd-resolve" conditional='ENABLE_RESOLVED'
+<refentry id="systemd-resolve" conditional='ENABLE_RESOLVE'
           xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>

diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml
index f452806dd33c004da19592b114ee67082ec6f57d..fd717e4963e7a62e4f3d623b9bda1c04ec59cc20 100644 (file)
--- a/man/systemd-resolved.service.xml
+++ b/man/systemd-resolved.service.xml
@@ -21,7 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="systemd-resolved.service" conditional='ENABLE_RESOLVED'>
+<refentry id="systemd-resolved.service" conditional='ENABLE_RESOLVE'>
 
   <refentryinfo>
     <title>systemd-resolved.service</title>

diff --git a/meson.build b/meson.build
index 47b54a980acce3525682307c9c16fb2b826c6ff6..ea53ebec3a2d933555158a531330623f8201d354 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1041,7 +1041,7 @@ foreach pair : [['utmp',          'ENABLE_UTMP'],
                 ['environment-d', 'ENABLE_ENVIRONMENT_D'],
                 ['binfmt',        'ENABLE_BINFMT'],
                 ['coredump',      'ENABLE_COREDUMP'],
-                ['resolve',       'ENABLE_RESOLVED'],
+                ['resolve',       'ENABLE_RESOLVE'],
                 ['logind',        'ENABLE_LOGIND'],
                 ['hostnamed',     'ENABLE_HOSTNAMED'],
                 ['localed',       'ENABLE_LOCALED'],
@@ -1222,7 +1222,7 @@ test_dlopen = executable(
 foreach tuple : [['myhostname', 'ENABLE_MYHOSTNAME'],
                  ['systemd',    'ENABLE_NSS_SYSTEMD'],
                  ['mymachines', 'ENABLE_MACHINED'],
-                 ['resolve',    'ENABLE_RESOLVED']]
+                 ['resolve',    'ENABLE_RESOLVE']]
 
         condition = tuple[1] == '' or conf.get(tuple[1]) == 1
         if condition
@@ -1405,7 +1405,7 @@ if conf.get('HAVE_BLKID') == 1
         public_programs += [exe]
 endif
 
-if conf.get('ENABLE_RESOLVED') == 1
+if conf.get('ENABLE_RESOLVE') == 1
         executable('systemd-resolved',
                    systemd_resolved_sources,
                    gcrypt_util_sources,

diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build
index 1b25e2667503e66995430d1d8e91ff8080561cf0..11238781c6c38a6a74d3af70030f63b9f74ef477 100644 (file)
--- a/shell-completion/bash/meson.build
+++ b/shell-completion/bash/meson.build
@@ -37,7 +37,7 @@ if bashcompletiondir != 'no'
                  ['loginctl',            'ENABLE_LOGIND'],
                  ['machinectl',          'ENABLE_MACHINED'],
                  ['networkctl',          'ENABLE_NETWORKD'],
-                 ['systemd-resolve',     'ENABLE_RESOLVED'],
+                 ['systemd-resolve',     'ENABLE_RESOLVE'],
                  ['timedatectl',         'ENABLE_TIMEDATED'],
                 ]
 

diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build
index a3a821e0b119779f56acf333a8cc007c30f861bc..4e7b33a8a7276e493485e99a24a945905c624b08 100644 (file)
--- a/shell-completion/zsh/meson.build
+++ b/shell-completion/zsh/meson.build
@@ -33,7 +33,7 @@ if zshcompletiondir != 'no'
                  ['_machinectl',               'ENABLE_MACHINED'],
                  ['_networkctl',               'ENABLE_NETWORKD'],
                  ['_systemd-inhibit',          'ENABLE_LOGIND'],
-                 ['_systemd-resolve',          'ENABLE_RESOLVED'],
+                 ['_systemd-resolve',          'ENABLE_RESOLVE'],
                  ['_systemd-tmpfiles',         'ENABLE_TMPFILES'],
                  ['_timedatectl',              'ENABLE_TIMEDATED'],
                 ]

diff --git a/src/resolve/meson.build b/src/resolve/meson.build
index 935214d6a517d92f7620005e5ea106e84585790c..75e654e60d772249bf72b84cf8472dee83c19a8a 100644 (file)
--- a/src/resolve/meson.build
+++ b/src/resolve/meson.build
@@ -123,7 +123,7 @@ systemd_resolve_sources = (basic_dns_sources +
                            systemd_resolve_only_sources +
                            dns_type_headers)
 
-if conf.get('ENABLE_RESOLVED') == 1
+if conf.get('ENABLE_RESOLVE') == 1
         install_data('org.freedesktop.resolve1.conf',
                      install_dir : dbuspolicydir)
         install_data('org.freedesktop.resolve1.service',
@@ -149,7 +149,7 @@ tests += [
          [libgcrypt,
           libgpg_error,
           libm],
-         'ENABLE_RESOLVED'],
+         'ENABLE_RESOLVE'],
 
         [['src/resolve/test-dns-packet.c',
           basic_dns_sources,
@@ -158,7 +158,7 @@ tests += [
          [libgcrypt,
           libgpg_error,
           libm],
-         'ENABLE_RESOLVED'],
+         'ENABLE_RESOLVE'],
 
         [['src/resolve/test-resolved-packet.c',
           basic_dns_sources,
@@ -167,7 +167,7 @@ tests += [
          [libgcrypt,
           libgpg_error,
           libm],
-         'ENABLE_RESOLVED'],
+         'ENABLE_RESOLVE'],
 
         [['src/resolve/test-dnssec.c',
           basic_dns_sources,
@@ -176,12 +176,12 @@ tests += [
          [libgcrypt,
           libgpg_error,
           libm],
-         'ENABLE_RESOLVED'],
+         'ENABLE_RESOLVE'],
 
         [['src/resolve/test-dnssec-complex.c',
           'src/resolve/dns-type.c',
           dns_type_headers],
          [],
          [],
-         'ENABLE_RESOLVED', 'manual'],
+         'ENABLE_RESOLVE', 'manual'],
 ]

diff --git a/src/test/test-nss.c b/src/test/test-nss.c
index 506bc3bd7908de1f32a8467e1557360d5149f4e8..91beada5b2686071e527d748cdf1ab06e659fb63 100644 (file)
--- a/src/test/test-nss.c
+++ b/src/test/test-nss.c
@@ -453,7 +453,7 @@ static int parse_argv(int argc, char **argv,
 #if ENABLE_MYHOSTNAME
                                 "myhostname",
 #endif
-#if ENABLE_RESOLVED
+#if ENABLE_RESOLVE
                                 "resolve",
 #endif
 #if ENABLE_MACHINED

diff --git a/sysusers.d/systemd.conf.m4 b/sysusers.d/systemd.conf.m4
index af97509c05cd1e3beef05166069c4177ceb43e2d..ef5a3cb6198ca0f6ba2866085ceb8e751060da92 100644 (file)
--- a/sysusers.d/systemd.conf.m4
+++ b/sysusers.d/systemd.conf.m4
@@ -9,7 +9,7 @@ g systemd-journal   - -
 m4_ifdef(`ENABLE_NETWORKD',
 u systemd-network   - "systemd Network Management"
 )m4_dnl
-m4_ifdef(`ENABLE_RESOLVED',
+m4_ifdef(`ENABLE_RESOLVE',
 u systemd-resolve   - "systemd Resolver"
 )m4_dnl
 m4_ifdef(`ENABLE_TIMESYNCD',

diff --git a/test/meson.build b/test/meson.build
index 236dbb04c35da60549ddb718b51c43faa9855583..995a971778893c3f9e5175a921c3f60290b6064a 100644 (file)
--- a/test/meson.build
+++ b/test/meson.build
@@ -133,7 +133,7 @@ test_data_files = '''
         journal-data/journal-2.txt
 '''.split()
 
-if conf.get('ENABLE_RESOLVED') == 1
+if conf.get('ENABLE_RESOLVE') == 1
         test_data_files += '''
                 test-resolve/_openpgpkey.fedoraproject.org.pkts
                 test-resolve/fedoraproject.org.pkts

diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4
index 064eae94f195fee3ce18182a5ae370c53bb5b857..35e3809f576ff55bca25fefe812250467cb68474 100644 (file)
--- a/tmpfiles.d/etc.conf.m4
+++ b/tmpfiles.d/etc.conf.m4
@@ -13,7 +13,7 @@ L+ /etc/mtab - - - - ../proc/self/mounts
 m4_ifdef(`HAVE_SMACK_RUN_LABEL',
 t /etc/mtab - - - - security.SMACK64=_
 )m4_dnl
-m4_ifdef(`ENABLE_RESOLVED',
+m4_ifdef(`ENABLE_RESOLVE',
 L! /etc/resolv.conf - - - - ../usr/lib/systemd/resolv.conf
 )m4_dnl
 C /etc/nsswitch.conf - - - -

diff --git a/units/meson.build b/units/meson.build
index 9dbba984486558b9ebc843d4aa125effe36ff972..8494d23e9e4058c2d8ef8dcfc9aee0a3b314bf16 100644 (file)
--- a/units/meson.build
+++ b/units/meson.build
@@ -180,7 +180,7 @@ in_units = [
         ['systemd-reboot.service',               ''],
         ['systemd-remount-fs.service',           '',
          'local-fs.target.wants/'],
-        ['systemd-resolved.service',             'ENABLE_RESOLVED',
+        ['systemd-resolved.service',             'ENABLE_RESOLVE',
          join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.resolve1.service') + ' ' +
          join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
         ['systemd-rfkill.service',               'ENABLE_RFKILL'],