nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix valac preprocessor conditionals

Browse source 
Two preprocessor conditionals for vala source files were defined
in config.h, which is not picked up during vala compilation. Now,
pass the defines as command line options to valac. Fixes #264
This commit is contained in:
Christian Kellner 2019-02-26 09:39:39 +01:00
parent 37185716fe
commit a0b211193a
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -144,8 +144,6 @@ conf.set_quoted('_WEB_EXTENSIONS_DIR', web_extensions_dir)
conf.set_quoted('LANGUAGE_SUPPORT_DIRECTORY', locale_dir)
conf.set_quoted('ISO_CODE_639_XML', iso_639_xml)
conf.set_quoted('ISO_CODE_3166_XML', iso_3166_xml)
conf.set('HAVE_LIBMESSAGINGMENU', libmessagingmenu.found())
conf.set('HAVE_LIBUNITY', libunity.found())
conf.set('HAVE_FTS3_TOKENIZE', true)
conf.set('VERSION', meson.project_version())
conf.set('GCR_API_SUBJECT_TO_CHANGE', true)

6
src/client/meson.build
View file

@ -127,6 +127,8 @@ geary_client_dependencies = [
geary_engine_dep,
]
geary_client_vala_options = geary_vala_options
if libmessagingmenu.found()
messagingmenu_vapi = meson.get_compiler('vala').find_library(
'MessagingMenu-1.0',
@ -135,16 +137,18 @@ if libmessagingmenu.found()
)
geary_client_dependencies += libmessagingmenu
geary_client_dependencies += messagingmenu_vapi
geary_client_vala_options += ['-D', 'HAVE_LIBMESSAGINGMENU']
endif
if libunity.found()
geary_client_dependencies += libunity
geary_client_vala_options += ['-D', 'HAVE_LIBUNITY']
endif
geary_client_lib = static_library('geary-client',
geary_client_sources,
dependencies: geary_client_dependencies,
include_directories: config_h_dir,
vala_args: geary_vala_options,
vala_args: geary_client_vala_options,
c_args: geary_c_options,
)