luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-04 04:56:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

meson: Add 'charsetalias-dir' option mirroring the autotools one

Browse Source 
This fixes the build again.
This commit is contained in:
Nirbheek Chauhan 2017-11-22 04:40:10 +05:30
parent 4e5c6616f0
commit c603ba301d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glib/libcharset/meson.build
View File

@ -1,4 +1,9 @@
charsetalias_dir = get_option('charsetalias-dir')
if charsetalias_dir == ''
charsetalias_dir = get_option('libdir')
endif
charset_lib = static_library('charset', 'localcharset.c', charset_lib = static_library('charset', 'localcharset.c',
include_directories : configinc, include_directories : configinc,
pic : true, pic : true,
c_args : [ '-DLIBDIR="@0@"'.format(get_option('libdir')) ] + glib_hidden_visibility_args) c_args : [ '-DGLIB_CHARSETALIAS_DIR="@0@"'.format(charsetalias_dir) ] + glib_hidden_visibility_args)

2
meson_options.txt
View File

@ -8,3 +8,5 @@ option('enable-systemtap', type : 'boolean', value : false,
description : 'include tracing support for systemtap') description : 'include tracing support for systemtap')
option('tapset-install-dir', type : 'string', value : '', option('tapset-install-dir', type : 'string', value : '',
description : 'path where systemtap tapsets are installed') description : 'path where systemtap tapsets are installed')
option('charsetalias-dir', type : 'string', value : '',
description : 'directory for charset.alias file (libdir by default)')