mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-09-20 01:06:15 +02:00
Install m4 macros unconditionally
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:
parent
b7fba1a5e3
commit
e8fde0b9e7
@ -1885,7 +1885,6 @@ endif
|
||||
|
||||
# Determine which user environment-dependent files that we want to install
|
||||
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
|
||||
|
||||
# FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578
|
||||
@ -1997,11 +1996,9 @@ if have_sh
|
||||
configuration : gettextize_conf)
|
||||
endif
|
||||
|
||||
if have_m4
|
||||
# Install m4 macros that other projects use
|
||||
install_data('m4macros/glib-2.0.m4', 'm4macros/glib-gettext.m4', 'm4macros/gsettings.m4',
|
||||
install_dir : join_paths(get_option('datadir'), 'aclocal'))
|
||||
endif
|
||||
# Install m4 macros that other projects use
|
||||
install_data('m4macros/glib-2.0.m4', 'm4macros/glib-gettext.m4', 'm4macros/gsettings.m4',
|
||||
install_dir : join_paths(get_option('datadir'), 'aclocal'))
|
||||
|
||||
if host_system != 'windows'
|
||||
# Install Valgrind suppression file (except on Windows,
|
||||
|
Loading…
Reference in New Issue
Block a user