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

[Martin Storsjö]

If some tools have been built in extras/tools (e.g. libtool), 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.
---
This shoud be an alternative to Hugo's attempt at making libtool
require building autoconf/automake in extras/tools.
---
 contrib/src/main.mak | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index cb5aea3..ddd8b16 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
 
 #########
-- 
2.7.4