Mon, 18 Apr 2022 22:21:59 -0500
Add a wrap file for libnice that is only used if -Dbuild-dependencies=true is passed to meson
We can optionally use this setup for our full dependency tree, but I'm not 100%
sure that's the best idea yet, but it does seem better than having it in a
separate repository.
Testing Done:
I made sure I had `libnice-dev` installed on debian and configured and built with with `build-dependencies` set to `true` and `false`.
I think removed `libnice-dev` and verified meson failed to configure with `build-dependencies=false`. I then reconfigured to set `build-dependencies=true` and verified that meson said it was going to build the subproject, and then I built the entire repository.
Bugs closed: PIDGIN-17577
Reviewed at https://reviews.imfreedom.org/r/1334/
| meson.build | file | annotate | diff | comparison | revisions | |
| meson_options.txt | file | annotate | diff | comparison | revisions | |
| subprojects/libnice.wrap | file | annotate | diff | comparison | revisions |
--- a/meson.build Mon Apr 18 22:08:30 2022 -0500 +++ b/meson.build Mon Apr 18 22:21:59 2022 -0500 @@ -254,7 +254,9 @@ ####################################################################### # Check for libnice ####################################################################### -nice = dependency('nice', version : '>=0.1.13') +nice = dependency('nice', + version : '>=0.1.13', + allow_fallback : get_option('build-dependencies')) ####################################################################### # Check Pidgin dependencies
--- a/meson_options.txt Mon Apr 18 22:08:30 2022 -0500 +++ b/meson_options.txt Mon Apr 18 22:21:59 2022 -0500 @@ -22,6 +22,9 @@ option('pixmaps-install', type : 'boolean', value : true, description : 'enable installation of pixmap files - Pidgin still needs them!') +option('build-dependencies', type : 'boolean', value : false, + description : 'enable the use of subprojects to build missing dependencies.') + ############################################################################## # Libpurple Options