meson: libmount autodectection

As it can be disabled, it should be automatic as the packahge might be
unavailable for a given target.
This commit is contained in:
stephane Cerveau 2020-01-29 11:15:47 +00:00 committed by Stéphane Cerveau
parent b3328d77c1
commit b220033cf0
2 changed files with 5 additions and 5 deletions

View File

@ -1923,9 +1923,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
# pkg-config file below
libmount_dep = []
if host_system == 'linux' and get_option('libmount')
libmount_dep = [dependency('mount', version : '>=2.23', required : true)]
glib_conf.set('HAVE_LIBMOUNT', 1)
if host_system == 'linux'
libmount_dep = dependency('mount', version : '>=2.23', required : get_option('libmount'))
glib_conf.set('HAVE_LIBMOUNT', libmount_dep.found())
endif
if host_system == 'windows'

View File

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