build-sys: s/HAVE_UTMP/ENABLE_UTMP/

"Have" should be about the external environment and dependencies. Anything
which is a pure yes/no choice should be "enable".

diff --git a/man/rules/meson.build b/man/rules/meson.build
index 9f7201a9099d9e8f0a9c4571f16a0fbe9f8605ee..a20029797a9e6349f15e6eb47598667b60ce3b81 100644 (file)
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -43,7 +43,7 @@ manpages = [
  ['os-release', '5', [], ''],
  ['pam_systemd', '8', [], 'HAVE_PAM'],
  ['resolved.conf', '5', ['resolved.conf.d'], 'ENABLE_RESOLVED'],
- ['runlevel', '8', [], 'HAVE_UTMP'],
+ ['runlevel', '8', [], 'ENABLE_UTMP'],
  ['sd-bus-errors',
   '3',
   ['SD_BUS_ERROR_ACCESS_DENIED',
@@ -632,7 +632,7 @@ manpages = [
  ['systemd-update-utmp.service',
   '8',
   ['systemd-update-utmp', 'systemd-update-utmp-runlevel.service'],
-  'HAVE_UTMP'],
+  'ENABLE_UTMP'],
  ['systemd-user-sessions.service', '8', ['systemd-user-sessions'], 'HAVE_PAM'],
  ['systemd-vconsole-setup.service',
   '8',

diff --git a/man/runlevel.xml b/man/runlevel.xml
index ca29c7c22cd8705a414fd467481351f7673f0755..50fdacde00d51cf3a534640f44c8e4b42f291bf0 100644 (file)
--- a/man/runlevel.xml
+++ b/man/runlevel.xml
@@ -23,7 +23,7 @@
 
 <refentry id="runlevel"
     xmlns:xi="http://www.w3.org/2001/XInclude"
-    conditional="HAVE_UTMP">
+    conditional="ENABLE_UTMP">
 
   <refentryinfo>
     <title>runlevel</title>

diff --git a/man/systemd-update-utmp.service.xml b/man/systemd-update-utmp.service.xml
index c8a9cb7c909140c3dc8d5ba6130c7b1e144ae5b2..be7cec236cffcadb79ef551bb0df5253f37fe15f 100644 (file)
--- a/man/systemd-update-utmp.service.xml
+++ b/man/systemd-update-utmp.service.xml
@@ -19,7 +19,7 @@
   You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
-<refentry id="systemd-update-utmp.service" conditional="HAVE_UTMP">
+<refentry id="systemd-update-utmp.service" conditional="ENABLE_UTMP">
 
   <refentryinfo>
     <title>systemd-update-utmp.service</title>

diff --git a/meson.build b/meson.build
index da0f015b762aebd40a48b4cd02359837ad9c51c1..5c98c937b763cac9ac9a59d4a685847fa2da8fcd 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1036,7 +1036,7 @@ else
 endif
 conf.set10('ENABLE_REMOTE', have)
 
-foreach pair : [['utmp',          'HAVE_UTMP'],
+foreach pair : [['utmp',          'ENABLE_UTMP'],
                 ['hibernate',     'ENABLE_HIBERNATE'],
                 ['environment-d', 'ENABLE_ENVIRONMENT_D'],
                 ['binfmt',        'ENABLE_BINFMT'],

diff --git a/src/basic/build.h b/src/basic/build.h
index 8ca8f706cbc9c5dcc9d9d9d1282b7f47e0e58405..522974b5e447b0bfb005d3ac8f279c5db1e2741b 100644 (file)
--- a/src/basic/build.h
+++ b/src/basic/build.h
@@ -61,7 +61,7 @@
 #define _SYSVINIT_FEATURE_ "-SYSVINIT"
 #endif
 
-#if HAVE_UTMP
+#if ENABLE_UTMP
 #define _UTMP_FEATURE_ "+UTMP"
 #else
 #define _UTMP_FEATURE_ "-UTMP"

diff --git a/src/shared/meson.build b/src/shared/meson.build
index bb9720a94a97217947335f821a397d8fee578e3b..883821352e67fdcf4c7e6d21a3c0ae3540f0d4eb 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -108,7 +108,7 @@ if conf.get('HAVE_ACL') == 1
         shared_sources += ['acl-util.c']
 endif
 
-if conf.get('HAVE_UTMP') == 1
+if conf.get('ENABLE_UTMP') == 1
         shared_sources += ['utmp-wtmp.c']
 endif
 

diff --git a/src/shared/utmp-wtmp.h b/src/shared/utmp-wtmp.h
index 8da594100aa293851e120c8e68b2ba9d48c6f2ce..8f4fbcdeff5680e1319eb436c8cf6259f1d28a98 100644 (file)
--- a/src/shared/utmp-wtmp.h
+++ b/src/shared/utmp-wtmp.h
@@ -25,7 +25,7 @@
 #include "time-util.h"
 #include "util.h"
 
-#if HAVE_UTMP
+#if ENABLE_UTMP
 int utmp_get_runlevel(int *runlevel, int *previous);
 
 int utmp_put_shutdown(void);
@@ -42,7 +42,7 @@ int utmp_wall(
         bool (*match_tty)(const char *tty, void *userdata),
         void *userdata);
 
-#else /* HAVE_UTMP */
+#else /* ENABLE_UTMP */
 
 static inline int utmp_get_runlevel(int *runlevel, int *previous) {
         return -ESRCH;
@@ -71,4 +71,4 @@ static inline int utmp_wall(
         return 0;
 }
 
-#endif /* HAVE_UTMP */
+#endif /* ENABLE_UTMP */

diff --git a/tmpfiles.d/var.conf.m4 b/tmpfiles.d/var.conf.m4
index e640fcd8c057aaf88cf6efaf28491476d871ce19..380c717ba671501d5c61cd24e041052416c365ff 100644 (file)
--- a/tmpfiles.d/var.conf.m4
+++ b/tmpfiles.d/var.conf.m4
@@ -12,7 +12,7 @@ q /var 0755 - - -
 L /var/run - - - - ../run
 
 d /var/log 0755 - - -
-m4_ifdef(`HAVE_UTMP',
+m4_ifdef(`ENABLE_UTMP',
 f /var/log/wtmp 0664 root utmp -
 f /var/log/btmp 0600 root utmp -
 f /var/log/lastlog 0664 root utmp -

diff --git a/units/meson.build b/units/meson.build
index f8ffe3fc45bd26f1e2d426618a7f3a60692b26ea..9dbba984486558b9ebc843d4aa125effe36ff972 100644 (file)
--- a/units/meson.build
+++ b/units/meson.build
@@ -205,9 +205,9 @@ in_units = [
          'sysinit.target.wants/'],
         ['systemd-update-done.service',          '',
          'sysinit.target.wants/'],
-        ['systemd-update-utmp-runlevel.service', 'HAVE_UTMP HAVE_SYSV_COMPAT',
+        ['systemd-update-utmp-runlevel.service', 'ENABLE_UTMP HAVE_SYSV_COMPAT',
          'multi-user.target.wants/ graphical.target.wants/ rescue.target.wants/'],
-        ['systemd-update-utmp.service',          'HAVE_UTMP',
+        ['systemd-update-utmp.service',          'ENABLE_UTMP',
          'sysinit.target.wants/'],
         ['systemd-user-sessions.service',        '',
          'multi-user.target.wants/'],