[gimp/wip/jtojnar/bundling-is-not-a-feature] meson: relocatable-bundle should not be a feature

[Jan Tojnar <jtojnar src gnome org>]

commit c7330bd3d4f53486b26301ef7a843a3ad3e31f34
Author: Jan Tojnar <jtojnar gmail com>
Date:   Fri Feb 7 02:11:36 2020 +0100

    meson: relocatable-bundle should not be a feature
    
    When we build GIMP with `-Dauto_features=enabled` to ensure we have
    fully-featured GIMP and to have it warn us when we are missing some
    optional dependency, Meson also enables relocatable bundle.
    
    This is unexpected since being relocatable is a binary property rather
    than a feature. This patch switches it option to a combo type to make
    it ignore auto_features option.
    
    This is unwanted

 meson.build       | 6 +++---
 meson_options.txt | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index ffce5462d8..da0632fbe7 100644
--- a/meson.build
+++ b/meson.build
@@ -305,11 +305,11 @@ no_dep = dependency('', required: false)
 ################################################################################
 # Mandatory Dependencies
 
-if get_option('relocatable-bundle').enabled()
+if get_option('relocatable-bundle') == 'enabled'
   relocatable_bundle = true
-elif get_option('relocatable-bundle').disabled()
+elif get_option('relocatable-bundle') == 'disabled'
   relocatable_bundle = false
-else # .auto()
+else # == 'auto'
   # By default, assume building for Windows or macOS everything to be on
   # the same prefix and can be relocated.
   # On other platforms, build-time paths are meaningful.
diff --git a/meson_options.txt b/meson_options.txt
index fc57ac5f56..ddc3972894 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -7,7 +7,9 @@ option('enable-multiproc',  type: 'boolean', value: true,   description: 'Suppor
 option('profiling',         type: 'boolean', value: false,  description: 'Enable profiling')
 option('windows-installer', type: 'boolean', value: false,  description: 'Generate files needed for the 
Windows installer')
 
-option('relocatable-bundle',type: 'feature', value: 'auto', description: 'build with resources considered 
bundled under the same prefix')
+option('relocatable-bundle',type: 'combo', value: 'auto', description: 'build with resources considered 
bundled under the same prefix',
+  choices: [ 'enabled', 'disabled', 'auto' ]
+)
 
 option('shmem-type',        type: 'combo',   value: 'auto', description: 'Shared memory transport type',
                                              choices: [ 'none', 'sysv', 'posix', 'win32', 'auto' ])