From 0ef85944b859db1377893d491b25dbf393b7f98a Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 19 Jan 2022 13:19:23 +0100 Subject: [PATCH] Update dependencies. zlib and microhttpd are used by libkiwix, not kiwix-tools. We indeed need libzim, but we use no feature related to xapian so no need to mark it as mandatory. (Libkiwix needs it and the check is there) --- README.md | 4 ++-- debian/control | 5 ++--- meson.build | 12 +++--------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 5cbb7c7..c78262e 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,8 @@ Dependencies The Kiwix tools rely on a few third party software libraries. They are prerequisites to the Kiwix tools compilation. Therefore, following libraries need to be available: -* [Libkiwix](https://github.com/kiwix/libkiwix) (package `libkiwix` on Debian/Ubuntu) -* [Zlib](https://www.zlib.net/) (package `zlib1g-dev` on Debian/Ubuntu) +* [libkiwix](https://github.com/kiwix/libkiwix) (package `libkiwix` on Debian/Ubuntu) +* [libzim](https://github.com/openzim/libzim) (package `libzim` on Debian/Ubuntu) These dependencies may or may not be packaged by your operating system. They may also be packaged but only in an older version. They diff --git a/debian/control b/debian/control index c23bf55..a4b35cd 100644 --- a/debian/control +++ b/debian/control @@ -3,11 +3,10 @@ Section: utils Priority: optional Maintainer: Kiwix team Build-Depends: debhelper-compat (= 13), - libkiwix-dev (>= 9.3.0~), - libmicrohttpd-dev, + libkiwix-dev (>= 10.0.0), + libzim-dev (>= 7.2.0), meson, pkg-config, - zlib1g-dev Standards-Version: 4.5.0 Homepage: https://github.com/kiwix/kiwix-tools Rules-Requires-Root: no diff --git a/meson.build b/meson.build index 9821b06..205e341 100644 --- a/meson.build +++ b/meson.build @@ -12,17 +12,11 @@ if static_linkage add_global_link_arguments('-static-libstdc++', '--static', language:'cpp') endif -libzim_dep = dependency('libzim', version : '>=7.2.0', static:static_linkage) -if not compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIAN') - error('Libzim seems to be compiled without xapian. Xapian support is mandatory.') -endif - thread_dep = dependency('threads') -libkiwix_dep = dependency('kiwix', version:'>=10.0.0', static:static_linkage) -microhttpd_dep = dependency('libmicrohttpd', static:static_linkage) -z_dep = dependency('zlib', static:static_linkage) +kiwixlib_dep = dependency('kiwix', version:'>=10.0.0', static:static_linkage) +libzim_dep = dependency('libzim', version:'>=7.2.0', static:static_linkage) -all_deps = [thread_dep, libzim_dep, libkiwix_dep, microhttpd_dep, z_dep] +all_deps = [thread_dep, kiwixlib_dep, libzim_dep] if static_linkage librt = compiler.find_library('rt', required:false)