sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make zlib into a top-level dependency

Browse Source 
many packages need it, not just rsvg
This commit is contained in:
John Cupitt 2022-02-19 16:05:18 +00:00
parent 3da7caee6c
commit dc4b6c920b
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meson.build
View File

@ -118,6 +118,13 @@ if cc.has_function('pthread_setattr_default_np', args: '-D_GNU_SOURCE', prefix:
cfg_var.set('HAVE_PTHREAD_DEFAULT_NP', '1') cfg_var.set('HAVE_PTHREAD_DEFAULT_NP', '1')
endif endif
# needed by rsvg and others
zlib_dep = dependency('zlib', version: '>=0.4', required: get_option('zlib'))
if zlib_dep.found()
libvips_deps += zlib_dep
cfg_var.set('HAVE_ZLIB', '1')
endif
gsf_dep = dependency('libgsf-1', version: '>=1.14.26', required: get_option('gsf')) gsf_dep = dependency('libgsf-1', version: '>=1.14.26', required: get_option('gsf'))
if gsf_dep.found() if gsf_dep.found()
libvips_deps += gsf_dep libvips_deps += gsf_dep
@ -320,15 +327,6 @@ if librsvg_dep.found() and cairo_dep.found()
if librsvg_dep.version().version_compare('>=2.46') if librsvg_dep.version().version_compare('>=2.46')
cfg_var.set('HAVE_RSVG_HANDLE_RENDER_DOCUMENT', '1') cfg_var.set('HAVE_RSVG_HANDLE_RENDER_DOCUMENT', '1')
endif endif
zlib_dep = dependency('zlib', version: '>=0.4', required: get_option('zlib'))
if zlib_dep.found()
libvips_deps += zlib_dep
cfg_var.set('HAVE_ZLIB', '1')
endif
endif
if get_option('zlib').enabled() and not librsvg_dep.found()
message('zlib is only enabled alongside rsvg, disabling as rsvg is not enabled')
endif endif
openslide_dep = dependency('openslide', version: '>=3.3.0', required: get_option('openslide')) openslide_dep = dependency('openslide', version: '>=3.3.0', required: get_option('openslide'))