diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2021-01-14 10:13:57 +0100 |
|---|---|---|
| committer | GStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2021-01-28 11:23:07 +0000 |
| commit | 71cc88cc9910e043659077213d2f31d09c9d94f6 (patch) | |
| tree | a5735f64bcf49c677dcb0a68879b9fc034c73acb | |
| parent | edb3bfa535ca8d84b26ae0c86d19dcbc10ff8fca (diff) | |
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: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/671>
| -rw-r--r-- | cerbero/config.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cerbero/config.py b/cerbero/config.py index b919d3b0..962b2c21 100644 --- a/cerbero/config.py +++ b/cerbero/config.py @@ -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, |