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".
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-10-03 12:19:30 +02:00
parent 70160ce891
commit 3211da4bcb
9 changed files with 13 additions and 13 deletions

View File

@ -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',

View File

@ -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>

View File

@ -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>

View File

@ -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'],

View File

@ -61,7 +61,7 @@
#define _SYSVINIT_FEATURE_ "-SYSVINIT"
#endif
#if HAVE_UTMP
#if ENABLE_UTMP
#define _UTMP_FEATURE_ "+UTMP"
#else
#define _UTMP_FEATURE_ "-UTMP"

View File

@ -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

View File

@ -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 */

View File

@ -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 -

View File

@ -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/'],