[vlc-commits] contrib: Add extras/tools/build/share/aclocal to ACLOCAL_AMFLAGS

[Martin Storsjö]

vlc | branch: master | Martin Storsjö <martin at martin.st> | Wed Jul 18 22:50:50 2018 +0300| [6e546c8aa8d91dcb50ea526d4153d25c0d96fbd0] | committer: Martin Storsjö

contrib: Add extras/tools/build/share/aclocal to ACLOCAL_AMFLAGS

If some tools (e.g. libtool) have been built in extras/tools, but
automake/autoconf haven't, we need to make sure to pick up the
aclocal files from there, otherwise the build will end up with
inconsistent results and the build will fail.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6e546c8aa8d91dcb50ea526d4153d25c0d96fbd0
---

 contrib/src/main.mak | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index cb5aea3d2e..ddd8b16aaa 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -188,6 +188,9 @@ HAVE_FPU = 1
 endif
 
 ACLOCAL_AMFLAGS += -I$(PREFIX)/share/aclocal
+ifneq ($(wildcard $(TOPSRC)/../extras/tools/build/share/aclocal/*),)
+ACLOCAL_AMFLAGS += -I$(abspath $(TOPSRC)/../extras/tools/build/share/aclocal)
+endif
 export ACLOCAL_AMFLAGS
 
 #########