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

Install m4 macros unconditionally

Browse Source 
Partial revert of commit a7a6449f4d.

Checking for the availability of m4 for installing m4 macro files
creates an implicit dependency on m4 even if GLib does not need it; this
prevents building GLib and then installing Autotools in order to build a
project that depends on GLib.

Closes #1520
This commit is contained in:
Emmanuele Bassi
2018-09-10 12:44:59 +01:00
parent b7fba1a5e3
commit e8fde0b9e7
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
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,