Attachment #677011 for bug #700282




    install_dir: dbus_service_dir,
)

#configure_file(
#    configuration: configuration_data({
#        'libexecdir': fprintd_installdir,
#    }),
#    input: 'fprintd.service.in',
#    output: 'fprintd.service',
#    install: true,
#    install_dir: systemd_unit_dir,
#)

polkit_policy = 'net.reactivated.fprint.device.policy'
polkit_policy_target = i18n.merge_file(polkit_policy,




libfprint_dep = dependency('libfprint-2', version: '>=' + libfprint_min_version)
polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.91')
dbus_dep = dependency('dbus-1', required: false)
libsystemd_dep = dependency('libelogind', required: get_option('pam'))
pam_dep = cc.find_library('pam',
    required: get_option('pam'),
    has_headers: 'security/pam_modules.h',

xsltproc = find_program('xsltproc', required: get_option('gtk_doc'))

# StateDirectory was introduced in systemd 235
#systemd_dep = dependency('systemd', version: '>= 235')
#systemd_unit_dir = get_option('systemd_system_unit_dir')

#if systemd_unit_dir == ''
#    systemd_unit_dir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
#endif

dbus_service_dir = get_option('dbus_service_dir')
dbus_data_dir = datadir

output += '  DBus service directory: ' + dbus_service_dir
output += '  DBus interfaces directory: ' + dbus_interfaces_dir
output += '  Polkit policy directory: ' + polkit_policy_directory
#output += '  Systemd service directory: ' + systemd_unit_dir
if get_option('pam')
    output += '  PAM module directory: ' + pam_modules_dir
endif

Return to bug 700282

Lines 11-25 configure_file( Link Here

(-)a/fprintd-1.90.5/data/meson.build (-9 / +9 lines)
11	install_dir: dbus_service_dir,	11	install_dir: dbus_service_dir,
12	)	12	)
13		13
14	configure_file(	14	#configure_file(
15	configuration: configuration_data({	15	# configuration: configuration_data({
16	'libexecdir': fprintd_installdir,	16	# 'libexecdir': fprintd_installdir,
17	}),	17	# }),
18	input: 'fprintd.service.in',	18	# input: 'fprintd.service.in',
19	output: 'fprintd.service',	19	# output: 'fprintd.service',
20	install: true,	20	# install: true,
21	install_dir: systemd_unit_dir,	21	# install_dir: systemd_unit_dir,
22	)	22	#)
23		23
24	polkit_policy = 'net.reactivated.fprint.device.policy'	24	polkit_policy = 'net.reactivated.fprint.device.policy'
25	polkit_policy_target = i18n.merge_file(polkit_policy,	25	polkit_policy_target = i18n.merge_file(polkit_policy,

Lines 83-89 Link Here

(-)fprintd-v1.90.5/meson.build.orig (-7 / +7 lines)
83	libfprint_dep = dependency('libfprint-2', version: '>=' + libfprint_min_version)	83	libfprint_dep = dependency('libfprint-2', version: '>=' + libfprint_min_version)
84	polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.91')	84	polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.91')
85	dbus_dep = dependency('dbus-1', required: false)	85	dbus_dep = dependency('dbus-1', required: false)
86	libsystemd_dep = dependency('libsystemd', required: get_option('pam'))	86	libsystemd_dep = dependency('libelogind', required: get_option('pam'))
87	pam_dep = cc.find_library('pam',	87	pam_dep = cc.find_library('pam',
88	required: get_option('pam'),	88	required: get_option('pam'),
89	has_headers: 'security/pam_modules.h',	89	has_headers: 'security/pam_modules.h',
Lines 93-104 Link Here
93	xsltproc = find_program('xsltproc', required: get_option('gtk_doc'))	93	xsltproc = find_program('xsltproc', required: get_option('gtk_doc'))
94		94
95	# StateDirectory was introduced in systemd 235	95	# StateDirectory was introduced in systemd 235
96	systemd_dep = dependency('systemd', version: '>= 235')	96	#systemd_dep = dependency('systemd', version: '>= 235')
97	systemd_unit_dir = get_option('systemd_system_unit_dir')	97	#systemd_unit_dir = get_option('systemd_system_unit_dir')
98		98
99	if systemd_unit_dir == ''	99	#if systemd_unit_dir == ''
100	systemd_unit_dir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')	100	# systemd_unit_dir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
101	endif	101	#endif
102		102
103	dbus_service_dir = get_option('dbus_service_dir')	103	dbus_service_dir = get_option('dbus_service_dir')
104	dbus_data_dir = datadir	104	dbus_data_dir = datadir
Lines 179-185 Link Here
179	output += ' DBus service directory: ' + dbus_service_dir	179	output += ' DBus service directory: ' + dbus_service_dir
180	output += ' DBus interfaces directory: ' + dbus_interfaces_dir	180	output += ' DBus interfaces directory: ' + dbus_interfaces_dir
181	output += ' Polkit policy directory: ' + polkit_policy_directory	181	output += ' Polkit policy directory: ' + polkit_policy_directory
182	output += ' Systemd service directory: ' + systemd_unit_dir	182	#output += ' Systemd service directory: ' + systemd_unit_dir
183	if get_option('pam')	183	if get_option('pam')
184	output += ' PAM module directory: ' + pam_modules_dir	184	output += ' PAM module directory: ' + pam_modules_dir
185	endif	185	endif