From e27ccbabc1fe5cafdd0b56098bb04e7213319002 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 7 Jan 2015 22:09:27 -0300 Subject: [PATCH] squid: fix automake breakage Squid bundles a copy of libltdl (from libtool) which autoreconfigures on its own. For some odd reason when automake was bumped to version 1.15 and if the host system has another automake version, for example 1.14, the ACLOCAL and AUTOMAKE variables don't expand properly when the internal autoreconf is triggered hence calling the missing handler which in turn tries to use an incorrect automake version. The solution is to pass unexpanded ACLOCAL and AUTOMAKE variables that defer the evaluation to a later moment and avoid the issue. Fixes: http://autobuild.buildroot.net/results/73f/73fcffafbea320f8c64378bbe8a96922b5e7c6b5/ Signed-off-by: Gustavo Zacarias Tested-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/squid/squid.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/squid/squid.mk b/package/squid/squid.mk index e9e821dd68..403818a6aa 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -20,7 +20,9 @@ SQUID_CONF_ENV = \ ac_cv_func_va_copy=yes \ ac_cv_func___va_copy=yes \ ac_cv_func_strnstr=no \ - ac_cv_have_squid=yes + ac_cv_have_squid=yes \ + ACLOCAL="$(ACLOCAL)" \ + AUTOMAKE="$(AUTOMAKE)" SQUID_CONF_OPTS = \ --enable-async-io=8 \ --enable-linux-netfilter \ -- 2.30.2