X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=meson.build;h=6fb0f74be6331dee04c81318c99b9a87ffd5ead4;hb=fb7b94545366926f6cb2f09dcda51365e301eda9;hp=6713315f91e41ba29c6d69694fe92f86a043f48a;hpb=498466c6434e479cd973fe7655b4feb51dd2c378;p=plocate

diff --git a/meson.build b/meson.build
index 6713315..6fb0f74 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.6-pre')
+project('plocate', 'cpp', default_options: ['buildtype=debugoptimized','cpp_std=c++17'], version: '1.1.11-pre')
 
 add_project_arguments('-DGROUPNAME="' + get_option('locategroup') + '"', language: 'cpp')
 add_project_arguments('-DUPDATEDB_CONF="/etc/updatedb.conf"', language: 'cpp')
@@ -77,12 +77,17 @@ 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')
+	unitdir = get_option('systemunitdir')
+	if unitdir == ''
+		systemd = dependency('systemd', required: false)
+		if systemd.found()
+			unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
+		endif
+	endif
+	if unitdir != ''
 		updatedb_service = configure_file(input: 'plocate-updatedb.service.in',
-		       output: 'plocate-updatedb.service',
-		       configuration: conf_data)
+			output: 'plocate-updatedb.service',
+			configuration: conf_data)
 		install_data(updatedb_service, install_dir: unitdir)
 		install_data('plocate-updatedb.timer', install_dir: unitdir)
 	endif
@@ -97,7 +102,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)