Attachment #558118 for bug #673406

View | Details | Raw Unified | Return to bug 673406
Collapse All | Expand All




# NOTE: This is used in data/meson.build
pkglibexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), 'sysprof')

# Check for sd-bus support either by systemd or elogind
sdbus_dep = dependency('libsystemd', version: '>=222', required: false)
if not sdbus_dep.found()
  sdbus_dep = dependency('libelogind', version: '>=239.3', required: false)
  if not sdbus_dep.found()
    error('sysprofd requires sd-bus but neither systemd nor elogind were found')
  endif
endif

sysprofd_deps = [
  sdbus_dep,
  dependency('glib-2.0'),
]


Lines 87-93 if get_option('with_sysprofd') == 'bundled' Link Here

(-)a/data/meson.build (-1 / +1 lines)
87		87
88	systemdunitdir = get_option('systemdunitdir')	88	systemdunitdir = get_option('systemdunitdir')
89	if systemdunitdir == ''	89	if systemdunitdir == ''
90	systemdunitdir = dependency('systemd').get_pkgconfig_variable('systemdsystemunitdir')	90	systemdunitdir = dependency('systemd', required: false).get_pkgconfig_variable('systemdsystemunitdir')
91	endif	91	endif
92	configure_file(	92	configure_file(
93	input: 'sysprof2.service.in',	93	input: 'sysprof2.service.in',

Return to bug 673406

Lines 11-18 sysprofd_sources = [ Link Here

(-)a/daemon/meson.build (-1 / +10 lines)
11	# NOTE: This is used in data/meson.build	11	# NOTE: This is used in data/meson.build
12	pkglibexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), 'sysprof')	12	pkglibexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), 'sysprof')
13		13
		14	# Check for sd-bus support either by systemd or elogind
		15	sdbus_dep = dependency('libsystemd', version: '>=222', required: false)
		16	if not sdbus_dep.found()
		17	sdbus_dep = dependency('libelogind', version: '>=239.3', required: false)
		18	if not sdbus_dep.found()
		19	error('sysprofd requires sd-bus but neither systemd nor elogind were found')
		20	endif
		21	endif
		22
14	sysprofd_deps = [	23	sysprofd_deps = [
15	dependency('libsystemd', version: '>=222'),	24	sdbus_dep,
16	dependency('glib-2.0'),	25	dependency('glib-2.0'),
17	]	26	]
18		27