build-sys: s/HAVE_MYHOSTNAME/ENABLE_MYHOSTNAME/

Same justification as for HAVE_UTMP. HAVE_MYHOSTNAME was used before mysthostname
was merged into systemd.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-10-03 12:23:55 +02:00
parent f9fa32f09c
commit 08cf5b8dc3
4 changed files with 6 additions and 6 deletions

View File

@ -22,7 +22,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
-->
<refentry id="nss-myhostname" conditional='HAVE_MYHOSTNAME'>
<refentry id="nss-myhostname" conditional='ENABLE_MYHOSTNAME'>
<refentryinfo>
<title>nss-myhostname</title>

View File

@ -36,7 +36,7 @@ manpages = [
['modules-load.d', '5', [], 'HAVE_KMOD'],
['networkctl', '1', [], 'ENABLE_NETWORKD'],
['networkd.conf', '5', ['networkd.conf.d'], 'ENABLE_NETWORKD'],
['nss-myhostname', '8', ['libnss_myhostname.so.2'], 'HAVE_MYHOSTNAME'],
['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-systemd', '8', ['libnss_systemd.so.2'], 'ENABLE_NSS_SYSTEMD'],

View File

@ -1049,7 +1049,7 @@ foreach pair : [['utmp', 'ENABLE_UTMP'],
['networkd', 'ENABLE_NETWORKD'],
['timedated', 'ENABLE_TIMEDATED'],
['timesyncd', 'ENABLE_TIMESYNCD'],
['myhostname', 'HAVE_MYHOSTNAME'],
['myhostname', 'ENABLE_MYHOSTNAME'],
['firstboot', 'ENABLE_FIRSTBOOT'],
['randomseed', 'ENABLE_RANDOMSEED'],
['backlight', 'ENABLE_BACKLIGHT'],
@ -1219,7 +1219,7 @@ test_dlopen = executable(
link_with : [libbasic],
dependencies : [libdl])
foreach tuple : [['myhostname', 'HAVE_MYHOSTNAME'],
foreach tuple : [['myhostname', 'ENABLE_MYHOSTNAME'],
['systemd', 'ENABLE_NSS_SYSTEMD'],
['mymachines', 'ENABLE_MACHINED'],
['resolve', 'ENABLE_RESOLVED']]
@ -2552,7 +2552,7 @@ foreach tuple : [
['blkid'],
['dbus'],
['glib'],
['nss-myhostname', conf.get('HAVE_MYHOSTNAME') == 1],
['nss-myhostname', conf.get('ENABLE_MYHOSTNAME') == 1],
['hwdb'],
['tpm'],
['man pages', want_man],

View File

@ -450,7 +450,7 @@ static int parse_argv(int argc, char **argv,
modules = strv_new(argv[1], NULL);
else
modules = strv_new(
#if HAVE_MYHOSTNAME
#if ENABLE_MYHOSTNAME
"myhostname",
#endif
#if ENABLE_RESOLVED