From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 4 Oct 2009 03:33:15 +0000 (+1300)
Subject: Define top_build_prefix fro use by LTDL
X-Git-Tag: SQUID_3_2_0_1~670
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0fb3665c2b5dfc0102b36d60a4f70ae0846870d0;p=thirdparty%2Fsquid.git

Define top_build_prefix fro use by LTDL

Linux LTDL v3-v7 macros assume the autoconf 2.62 variable top_build_prefix
is defined. But from autoconf 2.64 it's called ac_top_build_prefix and not
automatically added to the Makefile.

There seems to be no harm with sustituting it manually under autoconf 2.61 and 2.62
---

diff --git a/configure.in b/configure.in
index 85f0c52d98..c4821979ca 100644
--- a/configure.in
+++ b/configure.in
@@ -65,6 +65,11 @@ fi
 AC_LIBTOOL_DLOPEN
 if test $use_loadable_modules = yes;
 then
+    dnl Linux LTDL v3-v7 macros assume the autoconf 2.62 variable top_build_prefix is defined
+    dnl But from autoconf 2.64 its called ac_top_build_prefix and not automatically added to the Makefile
+    top_build_prefix=${ac_top_build_prefix}
+    AC_SUBST(top_build_prefix)
+
     AC_LIBLTDL_CONVENIENCE(lib/libLtdl)
 fi
 AC_PROG_LIBTOOL
diff --git a/test-suite/buildtests/layer-00-default.opts b/test-suite/buildtests/layer-00-default.opts
index fa83cf001a..b0252de87d 100644
--- a/test-suite/buildtests/layer-00-default.opts
+++ b/test-suite/buildtests/layer-00-default.opts
@@ -6,7 +6,7 @@ MAKETEST="distcheck"
 # Default configuration options.
 #  - Nothing special configured. Just whatever is found by "./configure"
 #
-OPTS="--disable-loadable-modules"
+OPTS=""
 
 # Fix the distclean testing.
 export DISTCHECK_CONFIGURE_FLAGS="${OPTS}"
diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts
index 31cf3bfa46..61667b9ba1 100644
--- a/test-suite/buildtests/layer-02-maximus.opts
+++ b/test-suite/buildtests/layer-02-maximus.opts
@@ -40,7 +40,7 @@ MAKETEST="distcheck"
 #
 #
 OPTS=" \
-	--disable-loadable-modules \
+	--enable-loadable-modules \
 	--enable-gnuregex \
 	--enable-optimizations \
 	--enable-inline \
diff --git a/test-suite/buildtests/os-debian.opts b/test-suite/buildtests/os-debian.opts
index f5a99d7d09..3ecb25b403 100644
--- a/test-suite/buildtests/os-debian.opts
+++ b/test-suite/buildtests/os-debian.opts
@@ -25,7 +25,6 @@ OPTS=" \
  \
 	--disable-maintainer-mode \
 	--disable-dependency-tracking \
-	--disable-loadable-modules \
 	--enable-inline \
 	--enable-async-io=8 \
 	--enable-storeio="ufs,aufs,coss,diskd,null" \