luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-13 15:56:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Meson: Remove legacy code used to write pc files

Browse Source 
We are using meson's generator now so those variables are not used
anymore.

https://bugzilla.gnome.org/show_bug.cgi?id=796264
This commit is contained in:
Xavier Claessens 2018-05-20 00:12:49 -04:00
parent eceac66e86
commit e2c154d9d8
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
meson.build
View File

@ -1684,6 +1684,7 @@ xgettext = find_program('xgettext', required : false)
libmount_dep = [] libmount_dep = []
if host_system == 'linux' and get_option('libmount') if host_system == 'linux' and get_option('libmount')
libmount_dep = [dependency('mount', version : '>=2.23', required : true)] libmount_dep = [dependency('mount', version : '>=2.23', required : true)]
glib_conf.set('HAVE_LIBMOUNT', 1)
endif endif
if host_system == 'windows' if host_system == 'windows'
@ -1693,7 +1694,6 @@ endif
selinux_dep = [] selinux_dep = []
if host_system == 'linux' and get_option('selinux') if host_system == 'linux' and get_option('selinux')
selinux_dep = [dependency('libselinux')] selinux_dep = [dependency('libselinux')]
glib_conf.set('SELINUX_LIBS', '-lselinux')
glib_conf.set('HAVE_SELINUX', 1) glib_conf.set('HAVE_SELINUX', 1)
endif endif
@ -1752,23 +1752,6 @@ glib_conf.set('STDC_HEADERS', 1)
# THREADS_NONE # THREADS_NONE
glib_conf.set('SIZEOF___INT64', 8) glib_conf.set('SIZEOF___INT64', 8)
# Various substs needed for our pkg-config files
# FIXME: Derive these from the dependency() objects (Meson support needed)
glib_conf.set('ZLIB_LIBS', zlib_libname)
glib_conf.set('LIBFFI_LIBS', '-lffi')
if libintl.found()
glib_conf.set('INTLLIBS', '-lintl')
endif
if libiconv.length() != 0
glib_conf.set('ICONV_LIBS', '-liconv')
endif
if use_system_pcre
glib_conf.set('PCRE_LIBS', '-lpcre')
endif
if libmount_dep.length() != 0
glib_conf.set('LIBMOUNT_LIBS', '-lmount')
glib_conf.set('HAVE_LIBMOUNT', 1)
endif
glib_conf.set('GIO_MODULE_DIR', glib_giomodulesdir) glib_conf.set('GIO_MODULE_DIR', glib_giomodulesdir)
# Sadly Meson does not expose this value: # Sadly Meson does not expose this value: