[gdk-pixbuf/ebassi/for-master] build: Don't do function checks for subprojects



commit 4679af8effe0411fd8b4ee823d708a543854af5e
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Apr 16 15:32:35 2021 -0400

    build: Don't do function checks for subprojects
    
    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.

 meson.build | 9 +++++++--
 1 file 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)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]