From 9e9703709681a904da62b080e025c416fb521d03 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20Wei=C3=9Fschuh?= Date: Fri, 2 Feb 2024 13:44:50 +0100 Subject: [PATCH] meson: use a dependency object for sqlite3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Weißschuh --- liblastlog2/meson.build | 4 +--- meson.build | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/liblastlog2/meson.build b/liblastlog2/meson.build index d77e556fc8..c3da5d40a0 100644 --- a/liblastlog2/meson.build +++ b/liblastlog2/meson.build @@ -7,8 +7,6 @@ lib_lastlog2_sources = ''' src/lastlog2.c '''.split() -libsqlite3 = cc.find_library('sqlite3') - liblastlog2_sym = 'src/liblastlog2.sym' liblastlog2_sym_path = '@0@/@1@'.format(meson.current_source_dir(), liblastlog2_sym) @@ -18,7 +16,7 @@ lib_lastlog2 = both_libraries( include_directories : [dir_include], link_args : ['-Wl,--version-script=@0@'.format(liblastlog2_sym_path)], link_depends : liblastlog2_sym, - dependencies : [libsqlite3], + dependencies : [lib_sqlite3], install : build_liblastlog2, version : liblastlog2_version, ) diff --git a/meson.build b/meson.build index 7bd87e6fa2..d9d29a4626 100644 --- a/meson.build +++ b/meson.build @@ -414,6 +414,8 @@ conf.set('HAVE_LIBAUDIT', lib_audit.found() ? 1 : false) conf.set('HAVE_SMACK', not get_option('smack').disabled()) +lib_sqlite3 = dependency('sqlite3', required : get_option('build-liblastlog2')) + foreach header : headers have = cc.has_header(header) conf.set('HAVE_' + header.underscorify().to_upper(), have ? 1 : false) -- 2.47.3