[tracker-miners/wip/carlosg/parallel-installable: 12/19] build: Drop unneeded defines from config-miners.h



commit e10bcb50bf8a9e6e7cdbdd9893fce0ade4c7a109
Author: Carlos Garnacho <carlosg gnome org>
Date:   Mon Feb 24 01:33:28 2020 +0100

    build: Drop unneeded defines from config-miners.h
    
    Some of those are unused since long ago.

 config-miners.h.meson.in | 19 -------------------
 meson.build              |  3 ---
 meson_options.txt        |  2 --
 3 files changed, 24 deletions(-)
---
diff --git a/config-miners.h.meson.in b/config-miners.h.meson.in
index 27cbe4052..79fd4c17e 100644
--- a/config-miners.h.meson.in
+++ b/config-miners.h.meson.in
@@ -4,22 +4,6 @@
 #mesondefine LOCALEDIR
 #mesondefine SHAREDIR
 #mesondefine TRACKER_MINERS_DIR
-#mesondefine TRACKER_UI_DIR
-
-/* Define if we disable the journal */
-#mesondefine DISABLE_JOURNAL
-
-/* Include functional tests in the installation */
-#mesondefine DIST_FUNCTIONAL_TESTS
-
-/* Use new evolution-shell API */
-#mesondefine EVOLUTION_SHELL_2_91
-
-/* Use new evolution-shell API */
-#mesondefine EVOLUTION_SHELL_3_2
-
-/* Use new evolution-shell API */
-#mesondefine EVOLUTION_SHELL_3_3_5
 
 /* Define the gettext package to be used */
 #mesondefine GETTEXT_PACKAGE
@@ -66,9 +50,6 @@
 /* Define if we have libseccomp */
 #mesondefine HAVE_LIBSECCOMP
 
-/* Define if we have libstemmer */
-#mesondefine HAVE_LIBSTEMMER
-
 /* Define if we have NetworkManager for network status detection */
 #mesondefine HAVE_NETWORK_MANAGER
 
diff --git a/meson.build b/meson.build
index f824d8c89..26db12397 100644
--- a/meson.build
+++ b/meson.build
@@ -312,7 +312,6 @@ endif
 conf = configuration_data()
 
 # Config that goes in config.h
-conf.set('DISABLE_JOURNAL', get_option('journal') == false)
 conf.set('GUARANTEE_METADATA', get_option('guarantee_metadata') == true)
 conf.set('USING_UNZIPPSFILES', get_option('unzip_ps_gz_files') == true)
 
@@ -339,7 +338,6 @@ conf.set('HAVE_STRNLEN', cc.has_function('strnlen', prefix : '#include <string.h
 conf.set('LOCALEDIR', '"@0@/@1@"'.format(get_option('prefix'), get_option('localedir')))
 conf.set('SHAREDIR', '"@0@/@1@"'.format(get_option('prefix'), get_option('datadir')))
 conf.set('TRACKER_MINERS_DIR', '"@0@"'.format(join_paths(get_option('prefix'), get_option('datadir'), 
tracker_versioned_name, 'miners')))
-conf.set('TRACKER_UI_DIR', '"@0@/@1@/tracker/"'.format(get_option('prefix'), get_option('datadir')))
 
 conf.set('GETTEXT_PACKAGE', '"@0@"'.format(tracker_versioned_name))
 conf.set('PACKAGE_VERSION', '"@0@"'.format(meson.project_version()))
@@ -436,7 +434,6 @@ summary = [
   '    Compiler:                               ' + cc.get_id(),
   '\nFeature Support:',
   '    Battery/mains power detection:          ' + battery_detection_library_name,
-  '    Build with Journal support:             ' + get_option('journal').to_string(),
   '    Support for network status detection:   ' + have_network_manager.to_string(),
   '\nData Miners / Writebacks:',
   '    FS (File System):                       ' + have_tracker_miner_fs.to_string(),
diff --git a/meson_options.txt b/meson_options.txt
index 46dbc7117..5d40ee2e0 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -9,8 +9,6 @@ option('functional_tests', type: 'boolean', value: true,
        description: 'Enable the Tracker functional test suite')
 option('guarantee_metadata', type: 'boolean', value: false,
        description: 'Set nie:title and nie:contentCreated from filename and mtime if no metadata available')
-option('journal', type: 'boolean', value: true,
-       description: 'Enable database journal backup mechanism')
 option('miner_fs', type: 'boolean', value: true,
        description: 'Enable the Tracker filesystem miner')
 option('miner_rss', type: 'boolean', value: true,


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