[gtk/gtk-3-24: 1/3] meson: cups: fix building without colord support



commit d36fb51c115c425376286cfb581ac13ee5387f00
Author: Christoph Reiter <creiter src gnome org>
Date:   Tue Jun 25 20:27:15 2019 +0200

    meson: cups: fix building without colord support
    
    The colord dependency object was always passed to the cups backend even
    if it wasn't declared.

 modules/printbackends/meson.build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/modules/printbackends/meson.build b/modules/printbackends/meson.build
index 3a6b660e6c..ef6af610ab 100644
--- a/modules/printbackends/meson.build
+++ b/modules/printbackends/meson.build
@@ -84,13 +84,13 @@ if enabled_print_backends.contains('cups')
     cups_error = 'Cannot find CUPS headers in default prefix.'
   endif
 
+  cups_extra_deps = []
   enable_colord = get_option('colord')
   if enable_colord != 'no'
     want_colord = enable_colord == 'yes'
     colord_dep = dependency('colord', version: '>= 0.1.9', required: want_colord)
     cdata.set('HAVE_COLORD', colord_dep.found() ? 1 : false)
-  else
-    cups_colord_dep = []
+    cups_extra_deps += [colord_dep]
   endif
 
   if cups_error != ''
@@ -168,7 +168,7 @@ if print_backends.contains('cups')
                 'cups/gtkcupsutils.c',
                 'cups/gtkcupssecretsutils.c',
                 c_args: printbackends_args,
-                dependencies: [libgtk_dep, libcups, colord_dep],
+                dependencies: [libgtk_dep, libcups] + cups_extra_deps,
                 install_dir: printbackends_install_dir,
                 install : true)
 endif


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