summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-04-16 15:32:35 -0400
committerMatthias Clasen <mclasen@redhat.com>2021-04-16 15:32:35 -0400
commit4679af8effe0411fd8b4ee823d708a543854af5e (patch)
treec256239d8c5ef89ca94ed113221cdbfb49913e3a
parentd283ffcd6b3b7a4ef2133af1248a7240d9a5d2f4 (diff)
downloadgdk-pixbuf-ebassi/for-master.tar.gz
build: Don't do function checks for subprojectsebassi/for-master
meson can't do function checks for subprojects, since these have not been built yet at configure time. So, check if we are in that case and bypass the checks. The libjpeg we build as a subproject is new enough to have those functions, anyway.
-rw-r--r--meson.build9
1 files changed, 7 insertions, 2 deletions
diff --git a/meson.build b/meson.build
index c07e9cb08..06c0d27dc 100644
--- a/meson.build
+++ b/meson.build
@@ -351,8 +351,13 @@ if get_option('jpeg') and not native_windows_loaders
endif
if jpeg_dep.found()
- has_destroy_decompress = cc.has_function('jpeg_destroy_decompress', dependencies: jpeg_dep)
- has_simple_progression = cc.has_function('jpeg_simple_progression', dependencies: jpeg_dep)
+ if jpeg_dep.type_name() == 'internal'
+ has_destroy_decompress = true
+ has_simple_progression = true
+ else
+ has_destroy_decompress = cc.has_function('jpeg_destroy_decompress', dependencies: jpeg_dep)
+ has_simple_progression = cc.has_function('jpeg_simple_progression', dependencies: jpeg_dep)
+ endif
if has_destroy_decompress and has_simple_progression
gdk_pixbuf_conf.set('HAVE_PROGRESSIVE_JPEG', has_simple_progression)