[tracker-miners] meson: Remove project options that are only relevant in tracker core



commit ba2a1216a902fe1c7a57dbbd0c34fea080c50724
Author: Sam Thursfield <sam thursfield codethink co uk>
Date:   Tue Oct 31 14:41:26 2017 +0000

    meson: Remove project options that are only relevant in tracker core

 meson.build       |   21 ---------------------
 meson_options.txt |    4 ----
 2 files changed, 0 insertions(+), 25 deletions(-)
---
diff --git a/meson.build b/meson.build
index b7b7a9d..00f9161 100644
--- a/meson.build
+++ b/meson.build
@@ -253,27 +253,6 @@ else
   systemd_user_services_dir = get_option('systemd_user_services')
 endif
 
-####################################################################
-# bash-completion
-####################################################################
-
-install_bash_completion = false
-if get_option('bash_completion') == 'yes' or get_option('bash_completion') == 'auto'
-  bash_completion_package = dependency('bash-completion', required: false)
-  if bash_completion_package.found()
-    bash_completion_dir = bash_completion_package.get_pkgconfig_variable('completionsdir')
-  else
-    bash_completion_dir = join_paths(get_option('prefix'), get_option('datadir'), 'bash-completion', 
'completions')
-  endif
-  install_bash_completion = true
-elif get_option('bash_completion') == 'no' or get_option('bash_completion') == ''
-  install_bash_completion = false
-  bash_completion_dir = '(disabled)'
-else
-  install_bash_completion = true
-  bash_completion_dir = get_option('bash_completion')
-endif
-
 tracker_major_version = meson.project_version().split('.')[0].to_int()
 tracker_minor_version = meson.project_version().split('.')[1].to_int()
 tracker_micro_version = meson.project_version().split('.')[2].to_int()
diff --git a/meson_options.txt b/meson_options.txt
index 1624c4a..0698433 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -2,8 +2,6 @@ option('docs', type: 'boolean', value: true,
        description: 'Enable the documentation')
 option('extract', type: 'boolean', value: true,
        description: 'Enable the Tracker metadata extractor')
-option('fts', type: 'boolean', value: true,
-       description: 'Enable the Tracker full-text search feature')
 option('functional_tests', type: 'boolean', value: true,
        description: 'Enable the Tracker functional test suite')
 option('guarantee_metadata', type: 'boolean', value: true,
@@ -41,8 +39,6 @@ option('stemmer', type: 'combo', choices: ['auto', 'no', 'yes'], value: 'no',
 option('unicode_support', type: 'combo', choices: ['icu', 'unistring', 'auto'], value: 'auto',
        description: 'Unicode support library to use')
 
-option('bash_completion', type: 'string', default: 'yes',
-       description: 'Directory to install Bash completion files (or "yes" for default directory, "no" to 
disable installation')
 option('dbus_services', type: 'string', default: '',
        description: 'Directory to install D-Bus .service files (leave blank to use the value from 
dbus-1.pc)')
 option('systemd_user_services', type: 'string', default: 'yes',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]