From 70653baa7cd507f698fc1143ebfe9731d4e88264 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Sat, 7 Sep 2024 15:26:21 +0200 Subject: [PATCH] Better check libzim version --- debian/control | 2 +- meson.build | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 0dfafc026..fa42663ee 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: libkiwix14 (= ${binary:Version}), ${misc:Depends}, python3, - libzim-dev (>= 9.0.0~), + libzim-dev (>= 9.0.0), libzim-dev (<< 10.0.0), libicu-dev, libpugixml-dev, libcurl4-gnutls-dev, diff --git a/meson.build b/meson.build index abc56b890..da40b1ff2 100644 --- a/meson.build +++ b/meson.build @@ -35,7 +35,9 @@ else error('Cannot found header mustache.hpp') endif -libzim_dep = dependency('libzim', version : '>=9.0.0', static:static_deps) +libzim_dep = dependency('libzim', version:'>=9.0.0', static:static_linkage) +libzim_dep = dependency('libzim', version:'<10.0.0', static:static_linkage) + if not compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIAN', dependencies: libzim_dep) error('Libzim seems to be compiled without xapian. Xapian support is mandatory.') endif