X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=meson.build;h=095392172d0810787baae0f8b515ed85e4bddc38;hb=d35a06868e3213b8c50c002ab2026fd2aa6bf8ac;hp=78435640816730a3541c13f52c8cdcf50b911919;hpb=65fca91084e9229b9a1a66048f41035e3f767e08;p=plocate

diff --git a/meson.build b/meson.build
index 7843564..0953921 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('plocate', 'cpp', default_options: ['buildtype=debugoptimized','cpp_std=c++17'], version: '1.1.4-pre')
+project('plocate', 'cpp', default_options: ['buildtype=debugoptimized','cpp_std=c++17'], version: '1.1.9')
 
 add_project_arguments('-DGROUPNAME="' + get_option('locategroup') + '"', language: 'cpp')
 add_project_arguments('-DUPDATEDB_CONF="/etc/updatedb.conf"', language: 'cpp')
@@ -77,15 +77,16 @@ updatedb_conf_man = configure_file(input: 'updatedb.conf.5.in',
 install_man(updatedb_conf_man)
 
 if get_option('install_systemd')
-	systemd = dependency('systemd', required: false)
-	if systemd.found()
-		unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
-		updatedb_service = configure_file(input: 'plocate-updatedb.service.in',
-		       output: 'plocate-updatedb.service',
-		       configuration: conf_data)
-		install_data(updatedb_service, install_dir: unitdir)
-		install_data('plocate-updatedb.timer', install_dir: unitdir)
+	unitdir = get_option('systemunitdir')
+	if unitdir == ''
+		unitdir = dependency('systemd').get_pkgconfig_variable('systemdsystemunitdir')
 	endif
+
+	updatedb_service = configure_file(input: 'plocate-updatedb.service.in',
+		output: 'plocate-updatedb.service',
+		configuration: conf_data)
+	install_data(updatedb_service, install_dir: unitdir)
+	install_data('plocate-updatedb.timer', install_dir: unitdir)
 endif
 
 # Requires having TurboPFor checked out, so not built by default.
@@ -97,7 +98,7 @@ if run_command('[', '-r', pfordir + '/libic.a', ']').returncode() == 0
 	turbopfordep = declare_dependency(
 		include_directories: include_directories('TurboPFor-Integer-Compression'),
 		dependencies: meson.get_compiler('cpp').find_library('ic', dirs: pfordir))
-	executable('bench', ['bench.cpp', 'io_uring_engine.cpp', 'turbopfor.cpp'],
+	executable('bench', ['bench.cpp', 'io_uring_engine.cpp', 'turbopfor.cpp', 'complete_pread.cpp'],
 		dependencies: [uringdep, turbopfordep],
 		build_by_default: false,
 		install: false)