mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: Add systemduserunitdir option

Browse source 
Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>
This commit is contained in:
Arnaud Rebillout 2018-11-26 13:33:44 +07:00 • committed by Arun Raghavan
parent a7b24ed03d
commit fdf3384f24
5 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
meson.build
View file

@ -66,6 +66,9 @@ if pulsedspdir == ''
pulsedspdir = join_paths(libdir, 'pulseaudio') pulsedspdir = join_paths(libdir, 'pulseaudio')
endif endif
systemduserunitdir = get_option('systemduserunitdir')
# the default value is set below
vapidir = join_paths(datadir, 'vala', 'vapi') vapidir = join_paths(datadir, 'vala', 'vapi')
bashcompletiondir = get_option('bashcompletiondir') bashcompletiondir = get_option('bashcompletiondir')
@ -345,11 +348,15 @@ if soxr_dep.found()
cdata.set('HAVE_SOXR', 1) cdata.set('HAVE_SOXR', 1)
endif endif
systemd_dep = dependency('libsystemd', required : get_option('systemd')) libsystemd_dep = dependency('libsystemd', required : get_option('systemd'))
if systemd_dep.found() if libsystemd_dep.found()
cdata.set('HAVE_SYSTEMD_DAEMON', 1) cdata.set('HAVE_SYSTEMD_DAEMON', 1)
cdata.set('HAVE_SYSTEMD_LOGIN', 1) cdata.set('HAVE_SYSTEMD_LOGIN', 1)
cdata.set('HAVE_SYSTEMD_JOURNAL', 1) cdata.set('HAVE_SYSTEMD_JOURNAL', 1)
systemd_dep = dependency('systemd', required : get_option('systemd'))
if systemd_dep.found() and systemduserunitdir == ''
systemduserunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
endif
endif endif
x11_dep = dependency('x11-xcb', required : get_option('x11')) x11_dep = dependency('x11-xcb', required : get_option('x11'))
@ -533,7 +540,7 @@ summary = [
' Enable ofono headsets: @0@'.format(get_option('bluez5-ofono-headset')), ' Enable ofono headsets: @0@'.format(get_option('bluez5-ofono-headset')),
'Enable udev: @0@'.format(udev_dep.found()), 'Enable udev: @0@'.format(udev_dep.found()),
' Enable HAL->udev compat: @0@'.format(get_option('hal-compat')), ' Enable HAL->udev compat: @0@'.format(get_option('hal-compat')),
'Enable systemd: @0@'.format(systemd_dep.found()), 'Enable systemd: @0@'.format(libsystemd_dep.found()),
# 'Enable TCP Wrappers: @0@'.format(${ENABLE_TCPWRAP}), # 'Enable TCP Wrappers: @0@'.format(${ENABLE_TCPWRAP}),
'Enable libsamplerate: @0@'.format(samplerate_dep.found()), 'Enable libsamplerate: @0@'.format(samplerate_dep.found()),
'Enable IPv6: @0@'.format(get_option('ipv6')), 'Enable IPv6: @0@'.format(get_option('ipv6')),

3
meson_options.txt
View file

@ -30,6 +30,9 @@ option('pulsedspdir',
option('modlibexecdir', option('modlibexecdir',
type : 'string', type : 'string',
description : 'Specify location where modules will be installed') description : 'Specify location where modules will be installed')
option('systemduserunitdir',
type : 'string',
description : 'Directory for systemd user service files')
option('bashcompletiondir', option('bashcompletiondir',
type : 'string', type : 'string',
description : 'Directory for bash completion files') description : 'Directory for bash completion files')

2
src/daemon/meson.build
View file

@ -29,7 +29,7 @@ executable('pulseaudio',
install: true, install: true,
include_directories : [configinc, topinc], include_directories : [configinc, topinc],
link_with : [libpulsecore, libpulsecommon, libpulse], link_with : [libpulsecore, libpulsecommon, libpulse],
dependencies : [ltdl_dep, cap_dep, dbus_dep, systemd_dep], dependencies : [ltdl_dep, cap_dep, dbus_dep, libsystemd_dep],
c_args : pa_c_args, c_args : pa_c_args,
) )

2
src/meson.build
View file

@ -183,7 +183,7 @@ libpulsecommon = shared_library('pulsecommon-' + pa_version_major_minor,
c_args : [pa_c_args], c_args : [pa_c_args],
install : true, install : true,
install_dir : privlibdir, install_dir : privlibdir,
dependencies : [libm_dep, thread_dep, shm_dep, sndfile_dep, dbus_dep, x11_dep, systemd_dep, glib_dep, gtk_dep, asyncns_dep], dependencies : [libm_dep, thread_dep, shm_dep, sndfile_dep, dbus_dep, x11_dep, libsystemd_dep, glib_dep, gtk_dep, asyncns_dep],
implicit_include_directories : false) implicit_include_directories : false)
libpulsecommon_dep = declare_dependency(link_with: libpulsecommon) libpulsecommon_dep = declare_dependency(link_with: libpulsecommon)

4
src/modules/meson.build
View file

@ -176,9 +176,9 @@ if openssl_dep.found()
endif endif
endif endif
if systemd_dep.found() if libsystemd_dep.found()
all_modules += [ all_modules += [
[ 'module-systemd-login', 'module-systemd-login.c', [], [], [systemd_dep] ], [ 'module-systemd-login', 'module-systemd-login.c', [], [], [libsystemd_dep] ],
] ]
endif endif