Commit 71cc88cc authored by Andoni Morales Alastruey's avatar Andoni Morales Alastruey Committed by GStreamer Marge Bot
Browse files

Fix build of autotools projects needing macros from build-tools

In Windows, the bootstrap used to build all the autotools and now it's
using the ones from the msys installation. During the autogen phase,
GTK+ requires the pkg-config macros that are installed in the
build-tools prefix. Since we use the msys autotools, the macros in
/share/aclocal are no longer in the default search paths. This patch
makes sure that the m4 macros installed by a build tool can be used.

Part-of: <!671>
parent edb3bfa5
Pipeline #263010 passed with stages
in 67 minutes and 17 seconds
......@@ -378,7 +378,10 @@ class Config (object):
xdgdatadir = os.path.join(prefix, 'share')
xdgconfigdir = os.path.join(prefix, 'etc', 'xdg')
xcursordir = os.path.join(prefix, 'share', 'icons')
aclocaldir = os.path.join(prefix, 'share', 'aclocal')
aclocalflags = '-I{} -I{}'.format(
os.path.join(prefix, 'share', 'aclocal'),
os.path.join(self.build_tools_prefix, 'share', 'aclocal'))
perlversionpath = os.path.join(libdir, 'perl5', 'site_perl',
self._perl_version())
if self.target_platform == Platform.WINDOWS:
......@@ -474,7 +477,7 @@ class Config (object):
'XDG_DATA_DIRS': xdgdatadir,
'XDG_CONFIG_DIRS': xdgconfigdir,
'XCURSOR_PATH': xcursordir,
'ACLOCAL_FLAGS': '-I%s' % aclocaldir,
'ACLOCAL_FLAGS': aclocalflags,
'ACLOCAL': "aclocal",
'PERL5LIB': perl5lib,
'GST_PLUGIN_PATH': gstpluginpath,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment