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".
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-10-03 13:12:29 +02:00
parent 08cf5b8dc3
commit 1ec57f3394
15 changed files with 26 additions and 26 deletions

View File

@ -21,7 +21,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>. 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"> xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo> <refentryinfo>
<title>dnssec-trust-anchors.d</title> <title>dnssec-trust-anchors.d</title>

View File

@ -22,7 +22,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>. 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> <refentryinfo>
<title>nss-resolve</title> <title>nss-resolve</title>

View File

@ -21,7 +21,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>. 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"> xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo> <refentryinfo>
<title>resolved.conf</title> <title>resolved.conf</title>

View File

@ -11,7 +11,7 @@ manpages = [
['dnssec-trust-anchors.d', ['dnssec-trust-anchors.d',
'5', '5',
['systemd.negative', 'systemd.positive'], ['systemd.negative', 'systemd.positive'],
'ENABLE_RESOLVED'], 'ENABLE_RESOLVE'],
['environment.d', '5', [], 'ENABLE_ENVIRONMENT_D'], ['environment.d', '5', [], 'ENABLE_ENVIRONMENT_D'],
['file-hierarchy', '7', [], ''], ['file-hierarchy', '7', [], ''],
['halt', '8', ['poweroff', 'reboot'], ''], ['halt', '8', ['poweroff', 'reboot'], ''],
@ -38,11 +38,11 @@ manpages = [
['networkd.conf', '5', ['networkd.conf.d'], 'ENABLE_NETWORKD'], ['networkd.conf', '5', ['networkd.conf.d'], 'ENABLE_NETWORKD'],
['nss-myhostname', '8', ['libnss_myhostname.so.2'], 'ENABLE_MYHOSTNAME'], ['nss-myhostname', '8', ['libnss_myhostname.so.2'], 'ENABLE_MYHOSTNAME'],
['nss-mymachines', '8', ['libnss_mymachines.so.2'], 'ENABLE_MACHINED'], ['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'], ['nss-systemd', '8', ['libnss_systemd.so.2'], 'ENABLE_NSS_SYSTEMD'],
['os-release', '5', [], ''], ['os-release', '5', [], ''],
['pam_systemd', '8', [], 'HAVE_PAM'], ['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'], ['runlevel', '8', [], 'ENABLE_UTMP'],
['sd-bus-errors', ['sd-bus-errors',
'3', '3',
@ -588,8 +588,8 @@ manpages = [
['systemd-random-seed'], ['systemd-random-seed'],
'ENABLE_RANDOMSEED'], 'ENABLE_RANDOMSEED'],
['systemd-remount-fs.service', '8', ['systemd-remount-fs'], ''], ['systemd-remount-fs.service', '8', ['systemd-remount-fs'], ''],
['systemd-resolve', '1', [], 'ENABLE_RESOLVED'], ['systemd-resolve', '1', [], 'ENABLE_RESOLVE'],
['systemd-resolved.service', '8', ['systemd-resolved'], 'ENABLE_RESOLVED'], ['systemd-resolved.service', '8', ['systemd-resolved'], 'ENABLE_RESOLVE'],
['systemd-rfkill.service', ['systemd-rfkill.service',
'8', '8',
['systemd-rfkill', 'systemd-rfkill.socket'], ['systemd-rfkill', 'systemd-rfkill.socket'],

View File

@ -21,7 +21,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>. 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"> xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo> <refentryinfo>

View File

@ -21,7 +21,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>. 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> <refentryinfo>
<title>systemd-resolved.service</title> <title>systemd-resolved.service</title>

View File

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

View File

@ -37,7 +37,7 @@ if bashcompletiondir != 'no'
['loginctl', 'ENABLE_LOGIND'], ['loginctl', 'ENABLE_LOGIND'],
['machinectl', 'ENABLE_MACHINED'], ['machinectl', 'ENABLE_MACHINED'],
['networkctl', 'ENABLE_NETWORKD'], ['networkctl', 'ENABLE_NETWORKD'],
['systemd-resolve', 'ENABLE_RESOLVED'], ['systemd-resolve', 'ENABLE_RESOLVE'],
['timedatectl', 'ENABLE_TIMEDATED'], ['timedatectl', 'ENABLE_TIMEDATED'],
] ]

View File

@ -33,7 +33,7 @@ if zshcompletiondir != 'no'
['_machinectl', 'ENABLE_MACHINED'], ['_machinectl', 'ENABLE_MACHINED'],
['_networkctl', 'ENABLE_NETWORKD'], ['_networkctl', 'ENABLE_NETWORKD'],
['_systemd-inhibit', 'ENABLE_LOGIND'], ['_systemd-inhibit', 'ENABLE_LOGIND'],
['_systemd-resolve', 'ENABLE_RESOLVED'], ['_systemd-resolve', 'ENABLE_RESOLVE'],
['_systemd-tmpfiles', 'ENABLE_TMPFILES'], ['_systemd-tmpfiles', 'ENABLE_TMPFILES'],
['_timedatectl', 'ENABLE_TIMEDATED'], ['_timedatectl', 'ENABLE_TIMEDATED'],
] ]

View File

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

View File

@ -453,7 +453,7 @@ static int parse_argv(int argc, char **argv,
#if ENABLE_MYHOSTNAME #if ENABLE_MYHOSTNAME
"myhostname", "myhostname",
#endif #endif
#if ENABLE_RESOLVED #if ENABLE_RESOLVE
"resolve", "resolve",
#endif #endif
#if ENABLE_MACHINED #if ENABLE_MACHINED

View File

@ -9,7 +9,7 @@ g systemd-journal - -
m4_ifdef(`ENABLE_NETWORKD', m4_ifdef(`ENABLE_NETWORKD',
u systemd-network - "systemd Network Management" u systemd-network - "systemd Network Management"
)m4_dnl )m4_dnl
m4_ifdef(`ENABLE_RESOLVED', m4_ifdef(`ENABLE_RESOLVE',
u systemd-resolve - "systemd Resolver" u systemd-resolve - "systemd Resolver"
)m4_dnl )m4_dnl
m4_ifdef(`ENABLE_TIMESYNCD', m4_ifdef(`ENABLE_TIMESYNCD',

View File

@ -133,7 +133,7 @@ test_data_files = '''
journal-data/journal-2.txt journal-data/journal-2.txt
'''.split() '''.split()
if conf.get('ENABLE_RESOLVED') == 1 if conf.get('ENABLE_RESOLVE') == 1
test_data_files += ''' test_data_files += '''
test-resolve/_openpgpkey.fedoraproject.org.pkts test-resolve/_openpgpkey.fedoraproject.org.pkts
test-resolve/fedoraproject.org.pkts test-resolve/fedoraproject.org.pkts

View File

@ -13,7 +13,7 @@ L+ /etc/mtab - - - - ../proc/self/mounts
m4_ifdef(`HAVE_SMACK_RUN_LABEL', m4_ifdef(`HAVE_SMACK_RUN_LABEL',
t /etc/mtab - - - - security.SMACK64=_ t /etc/mtab - - - - security.SMACK64=_
)m4_dnl )m4_dnl
m4_ifdef(`ENABLE_RESOLVED', m4_ifdef(`ENABLE_RESOLVE',
L! /etc/resolv.conf - - - - ../usr/lib/systemd/resolv.conf L! /etc/resolv.conf - - - - ../usr/lib/systemd/resolv.conf
)m4_dnl )m4_dnl
C /etc/nsswitch.conf - - - - C /etc/nsswitch.conf - - - -

View File

@ -180,7 +180,7 @@ in_units = [
['systemd-reboot.service', ''], ['systemd-reboot.service', ''],
['systemd-remount-fs.service', '', ['systemd-remount-fs.service', '',
'local-fs.target.wants/'], '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/dbus-org.freedesktop.resolve1.service') + ' ' +
join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
['systemd-rfkill.service', 'ENABLE_RFKILL'], ['systemd-rfkill.service', 'ENABLE_RFKILL'],