devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-29 05:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: introduce variable to check for xscreensaver

Browse Source 
`.found()` does not work on lists. And since this feature needs
several deps it is a list.
This commit is contained in:
Michael Vetter
2026-02-05 11:58:11 +01:00
parent 87c4b7ec53
commit 49ef85a58d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
meson.build
View File

@@ -239,7 +239,9 @@ if get_option('icons-and-clipboard').enabled() or get_option('icons-and-clipboar
endif endif
# XScreenSaver # XScreenSaver
xscrnsaver_dep = dependency('', required: false) # We use this variable because .found() will later not work on a list
xscrnsaver_found = false
xscrnsaver_dep = []
if get_option('xscreensaver').enabled() or get_option('xscreensaver').auto() if get_option('xscreensaver').enabled() or get_option('xscreensaver').auto()
xss_dep = dependency('xscrnsaver', required: false) xss_dep = dependency('xscrnsaver', required: false)
@@ -247,6 +249,7 @@ if get_option('xscreensaver').enabled() or get_option('xscreensaver').auto()
if xss_dep.found() and x11_dep.found() if xss_dep.found() and x11_dep.found()
xscrnsaver_dep = [xss_dep, x11_dep] xscrnsaver_dep = [xss_dep, x11_dep]
xscrnsaver_found = true # Set our tracker to true
conf_data.set('HAVE_LIBXSS', 1) conf_data.set('HAVE_LIBXSS', 1)
elif get_option('xscreensaver').enabled() elif get_option('xscreensaver').enabled()
error('xscreensaver support requested but xscrnsaver or x11 not found') error('xscreensaver support requested but xscrnsaver or x11 not found')
@@ -431,7 +434,7 @@ if gtk_dep.found()
profanity_deps += gtk_dep profanity_deps += gtk_dep
endif endif
if xscrnsaver_dep.found() if xscrnsaver_found
profanity_deps += xscrnsaver_dep profanity_deps += xscrnsaver_dep
endif endif
@@ -835,7 +838,7 @@ summary({
'OTR': build_otr, 'OTR': build_otr,
'PGP': build_pgp, 'PGP': build_pgp,
'OMEMO': build_omemo, 'OMEMO': build_omemo,
'XScreenSaver': xscrnsaver_dep.found(), 'XScreenSaver': xscrnsaver_found,
'GTK': gtk_dep.found(), 'GTK': gtk_dep.found(),
'GDK Pixbuf': gdk_pixbuf_dep.found(), 'GDK Pixbuf': gdk_pixbuf_dep.found(),
'QR Code': qrencode_dep.found(), 'QR Code': qrencode_dep.found(),