diff options
author | Jordan Williams <jordan@jwillikers.com> | 2024-04-08 08:30:24 -0500 |
---|---|---|
committer | Jordan Williams <jordan@jwillikers.com> | 2024-04-08 08:30:24 -0500 |
commit | 66463f0c5f52a4571c56a88b1a52b4547cb01c67 (patch) | |
tree | dead9fe8f2ab776c2591e2aad2f2a13464f64328 | |
parent | 07aacb371470b5561f13b95e399e5ff77e417b8f (diff) | |
download | util-linux-66463f0c5f52a4571c56a88b1a52b4547cb01c67.tar.gz |
meson: Enforce sqlite dependency for liblastlog2
liblastlog2 requires the sqlite dependency.
Currently, Meson enforces this dependency to be available only when the
build-liblastlog2 feature is explicitly enabled.
liblastlog2 is built by default, so if sqlite is not available, the
build will be configured correctly, but fail to compile.
This commit fixes this case by automatically disabling the
build-liblastlog2 feature when it is auto and sqlite is not found.
Signed-off-by: Jordan Williams <jordan@jwillikers.com>
-rw-r--r-- | meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build index e65cd9582f..58d75135a2 100644 --- a/meson.build +++ b/meson.build @@ -86,7 +86,8 @@ build_libuuid = not get_option('build-libuuid').disabled() conf.set('HAVE_LIBUUID', build_libuuid ? 1 : false) summary('libuuid', build_libuuid ? 'enabled' : 'disabled', section : 'components') -build_liblastlog2 = not get_option('build-liblastlog2').disabled() +lib_sqlite3 = dependency('sqlite3', required : get_option('build-liblastlog2')) +build_liblastlog2 = get_option('build-liblastlog2').require(lib_sqlite3.found()).allowed() conf.set('HAVE_LIBLASTLOG2', build_liblastlog2 ? 1 : false) summary('liblastlog2', build_liblastlog2 ? 'enabled' : 'disabled', section : 'components') @@ -430,7 +431,6 @@ 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) |