Changeset View
Changeset View
Standalone View
Standalone View
sysutils/accountsservice/files/patch-meson.build
| --- meson.build.orig 2018-09-29 12:54:53 UTC | --- meson.build.orig 2022-01-28 20:47:34 UTC | ||||
| +++ meson.build | +++ meson.build | ||||
| @@ -82,8 +82,11 @@ if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', p | @@ -57,6 +57,7 @@ config_h.set_quoted('GETTEXT_PACKAGE', act_gettext) | ||||
| elif cc.has_header_symbol('paths.h', '_PATH_WTMPX') | |||||
| # headers | |||||
| check_headers = [ | |||||
| + 'crypt.h', | |||||
| 'paths.h', | |||||
| 'shadow.h', | |||||
| 'utmpx.h', | |||||
| @@ -102,7 +103,6 @@ elif cc.has_header_symbol('paths.h', '_PATH_WTMPX') | |||||
| config_h.set('PATH_WTMP', '_PATH_WTMPX') | config_h.set('PATH_WTMP', '_PATH_WTMPX') | ||||
| else | else | ||||
| - assert(run_command('test', '-e', '/var/log/utx.log').returncode() == 0, 'Do not know which filename to watch for wtmp changes') | path_wtmp = '/var/log/utx.log' | ||||
| - config_h.set_quoted('PATH_WTMP', '/var/log/utx.log') | - assert(run_command('test', '-e', path_wtmp).returncode() == 0, 'Do not know which filename to watch for wtmp changes') | ||||
| + # Ugly hack for jails builders! | config_h.set_quoted('PATH_WTMP', path_wtmp) | ||||
| + _system = host_machine.system().to_lower() | |||||
| + if _system.contains('freebsd') | |||||
| + config_h.set_quoted('PATH_WTMP', '/var/log/utx.log') | |||||
| + endif | |||||
| endif | endif | ||||
| # compiler flags | @@ -207,10 +207,8 @@ config_h.set('MINIMUM_UID', get_option('minimum_uid')) | ||||
| gdm_conf_file = get_option('gdmconffile') | |||||
| config_h.set_quoted('PATH_GDM_CUSTOM', gdm_conf_file) | |||||
| -if get_option('elogind') | |||||
| - logind_dep = dependency('libelogind', version: '>= 229.4') | |||||
| -else | |||||
| - logind_dep = dependency('libsystemd', version: '>= 186') | |||||
| +if get_option('consolekit') | |||||
| + logind_dep = dependency('libconsolekit', version: '>= 1.2.0') | |||||
| endif | |||||
| subdir('data') | |||||