aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

build: transform all options to feature options

Browse Source 
According to @eli-schwartz review
https://github.com/profanity-im/profanity/pull/1619#discussion_r760421795:

```
"notifications" is a feature object. When configured with
-Dnotifications=disabled it logs:

Dependency libnotify skipped: feature notifications disabled
[...]
    notifications      : disabled

    and builds without support.

    pgp is a boolean option, which IMHO it shouldn't be. When configured
    with -Dpgp=false it logs:

    Run-time dependency gpgme found: YES 1.16.0
    [...]
        pgp                : false

        which is contradictory and misleading, because it was available
        and detected, just not required. So it tries to build with PGP
        support.

        BUILD_PGP is the Makefile.am define, not the C define. This
        should set HAVE_LIBGPGME.

        Later, in core_sources_c, check if pgp_dep.found() and add
        'src/pgp/gpg.c' as an additional source.
```
This commit is contained in:
Michael Vetter 2021-12-01 19:06:48 +01:00
parent 65ee9e8886
commit 3e6926f82a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meson_options.txt
View File

@ -1,9 +1,9 @@
option('notifications', type: 'feature', value: 'auto', description: 'enable desktop notifications')
option('python-plugins', type : 'boolean', value : 'false', description : 'enable Python plugins')
option('c-plugins', type : 'boolean', value : 'false', description : 'enable C plugins')
option('plugins', type : 'boolean', value : 'false', description : 'enable plugins')
option('otr', type : 'boolean', value : 'false', description : 'OTR encryption')
option('pgp', type : 'boolean', value : 'false', description : 'PGP encryption')
option('omemo', type : 'boolean', value : 'false', description : 'OMEMO encryption')
option('xscreensaver', type : 'boolean', value : 'false', description : 'use libXScrnSaver to determine idle time')
option('icons-and-clipboard', type : 'boolean', value : 'false', description : 'enable GTK tray icons and clipboard paste support')
option('python-plugins', type : 'feature', value : 'auto', description : 'enable Python plugins')
option('c-plugins', type : 'feature', value : 'auto', description : 'enable C plugins')
option('plugins', type : 'feature', value : 'auto', description : 'enable plugins')
option('otr', type : 'feature', value : 'auto', description : 'OTR encryption')
option('pgp', type : 'feature', value : 'auto', description : 'PGP encryption')
option('omemo', type : 'feature', value : 'auto', description : 'OMEMO encryption')
option('xscreensaver', type : 'feature', value : 'auto', description : 'use libXScrnSaver to determine idle time')
option('icons-and-clipboard', type : 'feature', value : 'auto', description : 'enable GTK tray icons and clipboard paste support')