luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-06-19 18:54:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dab_libmount_auto_detection' into 'master'

Browse Source 
meson: libmount autodectection

See merge request GNOME/glib!1344
This commit is contained in:
Philip Withnall 2020-02-03 08:20:44 +00:00
commit 12ee603039
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -1922,9 +1922,9 @@ glib_conf.set_quoted('GLIB_LOCALE_DIR', join_paths(glib_datadir, 'locale'))
# libmount is only used by gio, but we need to fetch the libs to generate the # libmount is only used by gio, but we need to fetch the libs to generate the
# pkg-config file below # pkg-config file below
libmount_dep = [] libmount_dep = []
if host_system == 'linux' and get_option('libmount') if host_system == 'linux'
libmount_dep = [dependency('mount', version : '>=2.23', required : true)] libmount_dep = dependency('mount', version : '>=2.23', required : get_option('libmount'))
glib_conf.set('HAVE_LIBMOUNT', 1) glib_conf.set('HAVE_LIBMOUNT', libmount_dep.found())
endif endif
if host_system == 'windows' if host_system == 'windows'

4
meson_options.txt
View File

@ -30,8 +30,8 @@ option('xattr',
description : 'build with xattr support') description : 'build with xattr support')
option('libmount', option('libmount',
type : 'boolean', type : 'feature',
value : true, value : 'auto',
description : 'build with libmount support') description : 'build with libmount support')
option('internal_pcre', option('internal_pcre',