diff --git a/kiwix.pc.in b/kiwix.pc.in deleted file mode 100644 index 259e1d75..00000000 --- a/kiwix.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -libdir=${prefix}/lib64 -includedir=${prefix}/include - -Name: libkiwix -Description: A library that contains a lot of things used by used by other kiwix programs -Version: @version@ -Requires: @requires@ -Libs: -L${libdir} -lkiwix @extra_libs@ -Cflags: -I${includedir}/ @extra_cflags@ diff --git a/meson.build b/meson.build index 22985870..9772a16f 100644 --- a/meson.build +++ b/meson.build @@ -35,11 +35,10 @@ else error('Cannot found header mustache.hpp') endif -libzim_dep = dependency('libzim', version:'>=9.0.0', static:static_deps) -libzim_dep = dependency('libzim', version:'<10.0.0', static:static_deps) +libzim_dep = dependency('libzim', version:['>=9.0.0', '<10.0.0'], static:static_deps) 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.') + error('Libzim seems to be compiled without Xapian. Xapian support is mandatory.') endif @@ -75,17 +74,10 @@ if get_option('doc') subdir('docs') endif -pkg_requires = ['libzim', 'icu-i18n', 'pugixml', 'libcurl', 'libmicrohttpd', 'xapian-core'] - -pkg_conf = configuration_data() -pkg_conf.set('prefix', get_option('prefix')) -pkg_conf.set('requires', ' '.join(pkg_requires)) -pkg_conf.set('extra_libs', ' '.join(extra_libs)) -pkg_conf.set('extra_cflags', extra_cflags) -pkg_conf.set('version', meson.project_version()) -configure_file(output : 'kiwix.pc', - configuration : pkg_conf, - input : 'kiwix.pc.in', - install_dir: get_option('libdir')+'/pkgconfig' - ) - +pkg_mod = import('pkgconfig') +pkg_mod.generate(libraries : [libkiwix] + extra_libs, + version : meson.project_version(), + name : 'libkiwix', + filebase : 'libkiwix', + description : 'A library that contains useful primitives that Kiwix readers have in common', + extra_cflags: extra_cflags)