From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 31 Jul 2010 14:18:30 +0000 (+1200)
Subject: Hack: define top_build_prefix for old autotools
X-Git-Tag: take1~433
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2148ef5866fbbd54bec3602827b4b7ca44c80d28;p=thirdparty%2Fsquid.git

Hack: define top_build_prefix for old autotools

This hack was removed during the libtool 2.2 upgrade.

The issue shows up as bundle builds failing to link libltdl/libltdlc.la
when they should in fact be linking ../libltdl/libltdlc.la in src/Makefile

It is caused by the macros of libtool 2.2 assuming the presence of
top_build_prefix but since autoconf 2.62 that was replaced with
ac_top_build_prefix and is no longer automatically defined in Makefile's.

Some distros also seem to have back-ported the removal of top_build_prefix
into their old autoconf causing macro version tests to fail.
---

diff --git a/configure.in b/configure.in
index dc65b49b3a..5a49cf0676 100644
--- a/configure.in
+++ b/configure.in
@@ -110,6 +110,14 @@ else
 fi
 
 LT_INIT([dlopen])
+if ! test "${ac_top_build_prefix}" = "";
+then
+	# LTDL v3-v7 macros assume the autoconf 2.62 variable top_build_prefix is defined
+	# But from autoconf 2.64 its called ac_top_build_prefix and not automatically added to the Makefile
+	# This fixes Linux LTDLv3-v7, and BSD LTDL v2.2
+	top_build_prefix=${ac_top_build_prefix}
+	AC_SUBST(top_build_prefix)
+fi
 LTDL_INIT
 
 dnl LibTool environment is now prepared for setup. Check that it is usable and initialize.