[vlc-devel] [PATCH 2/2] contrib: don't reuse files from previous autoconf during reconf

[Steve Lhomme]

On mingw with autoreconf 2.69 we end up with errors like this in mad when
aclocal is called:
aclocal: macro `_LT_COMPILER_PIC' required but not defined
aclocal: macro `_LT_DECL_SED' required but not defined
aclocal: macro `_LT_DECL_SED' required but not defined
aclocal: macro `_LT_FUNC_STRIPNAME_CNF' required but not defined
autoreconf: aclocal failed with exit status: 1

It seems aclocal uses the local version, not the one that autoreconf would pick
if it was missing.
---
 contrib/src/main.mak | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index e07a8c4..852d9df 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -372,8 +372,12 @@ UPDATE_AUTOCONFIG = for dir in $(AUTOMAKE_DATA_DIRS); do \
 ifdef HAVE_IOS
 AUTORECONF = AUTOPOINT=true autoreconf
 else
+ifdef HAVE_WIN32
+AUTORECONF = rm -rf aclocal.m4 Makefile.in && autoreconf
+else
 AUTORECONF = autoreconf
 endif
+endif
 RECONF = mkdir -p -- $(PREFIX)/share/aclocal && \
 	cd $< && $(AUTORECONF) -fiv $(ACLOCAL_AMFLAGS)
 CMAKE = cmake . -DCMAKE_TOOLCHAIN_FILE=$(abspath toolchain.cmake) \
-- 
2.8.1