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

Merge branch 'issue-1520' into 'master'

Browse Source 
Install m4 macros unconditionally

Closes #1520

See merge request GNOME/glib!314
This commit is contained in:
Xavier Claessens 2018-09-10 13:02:48 +00:00
commit d6da69f07d
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meson.build
View File

@ -1885,7 +1885,6 @@ endif
# Determine which user environment-dependent files that we want to install # Determine which user environment-dependent files that we want to install
have_bash = find_program('bash', required : false).found() # For completion scripts have_bash = find_program('bash', required : false).found() # For completion scripts
have_m4 = find_program('m4', required : false).found() # For m4 macros
have_sh = find_program('sh', required : false).found() # For glib-gettextize have_sh = find_program('sh', required : false).found() # For glib-gettextize
# FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578 # FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578
@ -1997,11 +1996,9 @@ if have_sh
configuration : gettextize_conf) configuration : gettextize_conf)
endif endif
if have_m4
# Install m4 macros that other projects use # Install m4 macros that other projects use
install_data('m4macros/glib-2.0.m4', 'm4macros/glib-gettext.m4', 'm4macros/gsettings.m4', install_data('m4macros/glib-2.0.m4', 'm4macros/glib-gettext.m4', 'm4macros/gsettings.m4',
install_dir : join_paths(get_option('datadir'), 'aclocal')) install_dir : join_paths(get_option('datadir'), 'aclocal'))
endif
if host_system != 'windows' if host_system != 'windows'
# Install Valgrind suppression file (except on Windows, # Install Valgrind suppression file (except on Windows,