From 08cf5b8dc356309becdb06c43de4d69228089a6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 3 Oct 2017 12:23:55 +0200
Subject: [PATCH] build-sys: s/HAVE_MYHOSTNAME/ENABLE_MYHOSTNAME/

Same justification as for HAVE_UTMP. HAVE_MYHOSTNAME was used before mysthostname
was merged into systemd.
---
 man/nss-myhostname.xml | 2 +-
 man/rules/meson.build  | 2 +-
 meson.build            | 6 +++---
 src/test/test-nss.c    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/man/nss-myhostname.xml b/man/nss-myhostname.xml
index c25476ecc8..6e05cb1897 100644
--- a/man/nss-myhostname.xml
+++ b/man/nss-myhostname.xml
@@ -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>
diff --git a/man/rules/meson.build b/man/rules/meson.build
index a20029797a..6112d337e1 100644
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -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'],
diff --git a/meson.build b/meson.build
index 71e038f9d3..47b54a980a 100644
--- a/meson.build
+++ b/meson.build
@@ -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],
diff --git a/src/test/test-nss.c b/src/test/test-nss.c
index ff89cb547b..506bc3bd79 100644
--- a/src/test/test-nss.c
+++ b/src/test/test-nss.c
@@ -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