diff options
| author | Karel Zak <kzak@redhat.com> | 2024-04-09 12:00:53 +0200 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2024-04-09 12:00:53 +0200 |
| commit | a06a5784ab94b62c2bb37290ea8037ca4a974d16 (patch) | |
| tree | db74123d212dd28b6a61b4ac04b49b598a93756d | |
| parent | aa0c45e8686df509c169121473d2cfb4fe18c3ea (diff) | |
| parent | 66463f0c5f52a4571c56a88b1a52b4547cb01c67 (diff) | |
| download | util-linux-a06a5784ab94b62c2bb37290ea8037ca4a974d16.tar.gz | |
Merge branch 'sqlite-dep-liblastlog2' of https://github.com/jwillikers/util-linux
* 'sqlite-dep-liblastlog2' of https://github.com/jwillikers/util-linux:
meson: Enforce sqlite dependency for liblastlog2
| -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) |