[tracker/wip/carlosg/parallel-installable: 6/12] build: Clean up config.h defines



commit d539ddcb13f4ada032e998c6a4082404e00da02b
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Feb 23 14:10:00 2020 +0100

    build: Clean up config.h defines
    
    Some of those were unused for a long time.

 config.h.meson.in | 62 -------------------------------------------------------
 meson.build       |  3 ---
 2 files changed, 65 deletions(-)
---
diff --git a/config.h.meson.in b/config.h.meson.in
index 8c7f99937..9dece4045 100644
--- a/config.h.meson.in
+++ b/config.h.meson.in
@@ -3,90 +3,31 @@
 /* Extras added manually */
 #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
 
-/* Define that GStreamer Discoverer should be used */
-#mesondefine GSTREAMER_BACKEND_DISCOVERER
-
-/* Define that GUPnP-DLNA should be used */
-#mesondefine GSTREAMER_BACKEND_GUPNP_DLNA
-
-/* Guarantee existence of some metadata */
-#mesondefine GUARANTEE_METADATA
-
 /* Defined if Sqlite has FTS5 compiled in */
 #mesondefine HAVE_BUILTIN_FTS
 
-/* Define if we have exempi */
-#mesondefine HAVE_EXEMPI
-
-/* Define to 1 if you have the `getline' function. */
-#mesondefine HAVE_GETLINE
-
-/* Define if we have GStreamer */
-#mesondefine HAVE_GSTREAMER
-
-/* Define if we have libcue */
-#mesondefine HAVE_LIBCUE
-
-/* Define if we have libcue 2 or up */
-#mesondefine HAVE_LIBCUE2
-
-/* Define if we have libexif */
-#mesondefine HAVE_LIBEXIF
-
 /* libicu Unicode support library */
 #mesondefine HAVE_LIBICU
 
-/* Define if we have libiptcdata */
-#mesondefine HAVE_LIBIPTCDATA
-
 /* Define if we have libstemmer */
 #mesondefine HAVE_LIBSTEMMER
 
 /* libunistring Unicode support library */
 #mesondefine HAVE_LIBUNISTRING
 
-/* Define if we have NetworkManager for network status detection */
-#mesondefine HAVE_NETWORK_MANAGER
-
 /* Define to 1 if you have the `posix_fadvise' function. */
 #mesondefine HAVE_POSIX_FADVISE
 
 /* Define to 1 if you have the `statvfs64' function. */
 #mesondefine HAVE_STATVFS64
 
-/* Define to 1 if you have the `strnlen' function. */
-#mesondefine HAVE_STRNLEN
-
 /* Define to 0 if tracker FTS is not compiled */
 #mesondefine HAVE_TRACKER_FTS
 
-/* Define if we have UPOWER */
-#mesondefine HAVE_UPOWER
-
-/* Define to 1 if you have the `up_client_get_on_low_battery' function. */
-#mesondefine HAVE_UP_CLIENT_GET_ON_LOW_BATTERY
-
 /* Define to the address where bug reports for this package should be sent. */
 #mesondefine PACKAGE_BUGREPORT
 
@@ -119,6 +60,3 @@
 
 /* Define to the Tracker minor version */
 #mesondefine TRACKER_MINOR_VERSION
-
-/* Unzip ps.gz files */
-#mesondefine USING_UNZIPPSFILES
diff --git a/meson.build b/meson.build
index 15b1c8f66..53e71e3e7 100644
--- a/meson.build
+++ b/meson.build
@@ -201,14 +201,11 @@ conf.set('HAVE_LIBICU', unicode_library_name == 'icu')
 conf.set('HAVE_LIBSTEMMER', have_libstemmer)
 conf.set('HAVE_LIBUNISTRING', unicode_library_name == 'unistring')
 
-conf.set('HAVE_GETLINE', cc.has_function('getline', prefix : '#include <stdio.h>'))
 conf.set('HAVE_POSIX_FADVISE', cc.has_function('posix_fadvise', prefix : '#include <fcntl.h>'))
 conf.set('HAVE_STATVFS64', cc.has_header_symbol('sys/statvfs.h', 'statvfs64', args: '-D_LARGEFILE64_SOURCE'))
-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@/@1@/tracker/miners"'.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()))


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