Merge branch 'buildfix' into 'master'

Meson build fixes for FreeBSD

See merge request GNOME/geary!78

desktop/meson.build

@@ -25,7 +25,7 @@ if install_contractor_file
   # Description field. See merge req !50.
   msgfmt = find_program('msgfmt')
 
-  custom_target(
+  custom_target('geary-attach-contract',
     input: 'geary-attach.contract.desktop.in',
     output: 'geary-attach.contract',
     command: [msgfmt, '--desktop', '--keyword=Description', '--template', '@INPUT@', '-d', po_dir, '-o', '@OUTPUT@'],

meson.build

@@ -20,6 +20,7 @@ cc = meson.get_compiler('c')
 valac = meson.get_compiler('vala')
 config_h_dir = include_directories('.')
 geary_prefix = get_option('prefix')
+bindir = join_paths(geary_prefix, get_option('bindir'))
 datadir = join_paths(geary_prefix, get_option('datadir'))
 libdir = join_paths(geary_prefix, get_option('libdir'))
 locale_dir = join_paths(geary_prefix, get_option('localedir'))
@@ -93,7 +94,7 @@ libunity = dependency('unity', version: '>= 5.12.0', required: false)
 libmessagingmenu = meson.get_compiler('c').find_library('libmessaging-menu', required: false)
 
 # Ensure SQLite was built correctly
-if not cc.has_header_symbol('sqlite3.h', 'SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER')
+if not cc.has_header_symbol('sqlite3.h', 'SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER', dependencies: sqlite)
   error('SQLite3 is missing FTS3 tokenizer support. Please compile it with -DSQLITE_ENABLE_FTS3.\n'
         + 'See https://bugzilla.gnome.org/show_bug.cgi?id=763203 for details.')
 endif

src/engine/meson.build

@@ -371,7 +371,7 @@ geary_engine_internal_header_fixup = custom_target(
   ],
   command: [
     find_program('sed'),
-    '-i',
+    '-ibak',
     's/geary-engine.h/geary-engine-internal.h/g',
     '@OUTDIR@/geary-engine-internal.vapi',
   ],