meson: fix relocatable-bundle feature and mypaint-brushes dependency.

It must not be a boolean but a `feature` option, with `auto` by default.
`auto` value mean enabled for macOS and Win32, and disabled for other
cases. This default logics disappeared in the meson build.

Also the mypaint-brushes package is a mandatory dependency, which must
always be checked. Absence is fatale.
Finally properly set the MYPAINT_BRUSHES_DIR macro depending on the
proper relocatable case.
This commit is contained in:
Jehan 2019-09-21 13:32:13 +02:00
parent 2b67a54b15
commit 738dab0fce
4 changed files with 36 additions and 19 deletions

View file

@ -7,7 +7,7 @@ manconf.set('gimplocaledir', prefix / localedir)
manconf.set('gimpplugindir', prefix / gimpplugindir)
manconf.set('manpage_gimpdir', '$XDG_CONFIG_HOME/' + gimpdir / gimp_app_version)
manconf.set('gimpsysconfdir', prefix / gimpsysconfdir)
manconf.set('mypaint_brushes_dir', libmypaint_brushes_dir)
manconf.set('mypaint_brushes_dir', mypaint_brushes_dir)
man_files = [