Commit 771f3048 authored by Zeeshan Ali's avatar Zeeshan Ali

meson: Simpler meson options

Remove 'enable-' prefix from most options.
parent 53e6c066
if get_option('enable-backend')
conf = configuration_data()
if get_option('enable-demo-agent')
if get_option('demo-agent')
conf.set('demo_agent', 'geoclue-demo-agent;')
else
conf.set('demo_agent', '')
......
......@@ -5,7 +5,7 @@ i18n = import('i18n')
desktop_conf = configuration_data()
desktop_conf.set('libexecdir', get_option('libexecdir'))
if get_option('enable-libgeoclue')
if get_option('libgeoclue')
include_dirs = [ configinc,
libgeoclue_public_api_inc,
include_directories('../libgeoclue') ]
......@@ -30,7 +30,7 @@ if get_option('enable-libgeoclue')
install_dir: desktop_dir)
endif
if get_option('enable-demo-agent')
if get_option('demo-agent')
include_dirs = [ configinc,
libgeoclue_public_api_inc,
libgeoclue_agent_inc ]
......
......@@ -56,7 +56,7 @@ libgeoclue = library('geoclue-2',
gir = find_program('g-ir-scanner', required: false)
vapigen = find_program('vapigen', required: false)
cross_build = meson.is_cross_build()
enable_gir = get_option('enable-introspection')
enable_gir = get_option('introspection')
pkg_requirements = ['glib-2.0', 'gio-2.0', 'gio-unix-2.0']
gir_sources = [ libgeoclue_sources,
libgeoclue_headers,
......
......@@ -43,13 +43,13 @@ subdir('public-api')
if get_option('enable-backend')
subdir('src')
endif
if get_option('enable-libgeoclue')
if get_option('libgeoclue')
subdir('libgeoclue')
endif
subdir('data')
subdir('demo')
subdir('po')
if get_option('enable-gtk-doc')
if get_option('gtk-doc')
subdir('docs')
endif
option('enable-libgeoclue',
option('libgeoclue',
type: 'boolean', value: true,
description: 'Enable convenience library')
option('enable-introspection',
option('introspection',
type: 'boolean', value: true,
description: 'Enable convenience library introspection generation')
option('enable-gtk-doc',
option('gtk-doc',
type: 'boolean', value: true,
description: 'Whether to generate the API reference for Geocode-GLib')
option('enable-3g-source',
option('3g-source',
type: 'boolean', value: true,
description: 'Enable 3G source (requires ModemManager')
option('enable-cdma-source',
option('cdma-source',
type: 'boolean', value: true,
description: 'Enable CDMA source (requires ModemManager')
option('enable-modem-gps-source',
option('modem-gps-source',
type: 'boolean', value: true,
description: 'Enable modem GPS source (requires ModemManager')
option('enable-nmea-source',
option('nmea-source',
type: 'boolean', value: true,
description: 'Enable network NMEA source (requires Avahi libraries)')
option('enable-backend',
type: 'boolean', value: true,
description: 'Enable backend (the geoclue service)')
option('enable-demo-agent',
option('demo-agent',
type: 'boolean', value: true,
description: 'Build demo agent')
option('enable-debug',
option('debug',
type: 'boolean', value: false,
description: 'Build debug build')
option('dbus-sys-dir',
......
......@@ -87,9 +87,9 @@ sources += [ 'gclue-main.c',
'gclue-min-uint.h', 'gclue-min-uint.c',
'gclue-location.h', 'gclue-location.c' ]
if get_option('enable-3g-source') or
get_option('enable-cdma-source') or
get_option('enable-modem-gps-source')
if get_option('3g-source') or
get_option('cdma-source') or
get_option('modem-gps-source')
geoclue_deps += [ dependency('mm-glib', version: '>= 1.6') ]
sources += [ 'gclue-modem.c',
'gclue-modem.h',
......@@ -97,19 +97,19 @@ if get_option('enable-3g-source') or
'gclue-modem-manager.h' ]
endif
if get_option('enable-3g-source')
if get_option('3g-source')
sources += [ 'gclue-3g.c', 'gclue-3g.h' ]
endif
if get_option('enable-cdma-source')
if get_option('cdma-source')
sources += [ 'gclue-cdma.c', 'gclue-cdma.h' ]
endif
if get_option('enable-modem-gps-source')
if get_option('modem-gps-source')
sources += [ 'gclue-modem-gps.c', 'gclue-modem-gps.h' ]
endif
if get_option('enable-nmea-source')
if get_option('nmea-source')
geoclue_deps += [ dependency('avahi-client', version: '>= 0.6.10'),
dependency('avahi-glib', version: '>= 0.6.10') ]
sources += [ 'gclue-nmea-source.h', 'gclue-nmea-source.c' ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment