1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
diff --git a/libfprint/meson.build b/libfprint/meson.build
index abd0005..e91e0ec 100644
--- a/libfprint/meson.build
+++ b/libfprint/meson.build
@@ -159,7 +159,7 @@ if aes3k
endif
other_sources = []
-if imaging_dep.found()
+if imaging_dep != [] and imaging_dep.found()
other_sources += [ 'fpi-img-pixman.c' ]
endif
@@ -180,6 +180,8 @@ libfprint_sources += configure_file(input: 'empty_file',
])
deps = [ mathlib_dep, glib_dep, libusb_dep, nss_dep, imaging_dep ]
+libvfsFprintWrapper_dir='/usr/lib/'
+subdir('drivers/vfs_proprietary')
libfprint = library('fprint',
libfprint_sources + drivers_sources + nbis_sources + other_sources,
soversion: soversion,
diff --git a/meson.build b/meson.build
index db5008f..a192fb2 100644
--- a/meson.build
+++ b/meson.build
@@ -46,6 +46,7 @@ mathlib_dep = cc.find_library('m', required: false)
# Drivers
drivers = get_option('drivers').split(',')
all_drivers = [ 'upekts', 'upektc', 'upeksonly', 'vcom5s', 'uru4000', 'aes1610', 'aes1660', 'aes2501', 'aes2550', 'aes2660', 'aes3500', 'aes4000', 'vfs101', 'vfs301', 'vfs5011', 'upektc_img', 'etes603', 'vfs0050', 'elan' ]
+all_drivers += [ 'vfs_proprietary' ]
primitive_drivers = [ 'upekts' ]
if drivers == [ 'all' ]
|