]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Define top_build_prefix fro use by LTDL
authorAmos Jeffries <squid3@treenet.co.nz>
Sun, 4 Oct 2009 03:33:15 +0000 (16:33 +1300)
committerAmos Jeffries <squid3@treenet.co.nz>
Sun, 4 Oct 2009 03:33:15 +0000 (16:33 +1300)
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

configure.in
test-suite/buildtests/layer-00-default.opts
test-suite/buildtests/layer-02-maximus.opts
test-suite/buildtests/os-debian.opts

index 85f0c52d985baeb09098e4262322506583b90276..c4821979cafa89449cd7f7cc0d1228d7cdd0c9a8 100644 (file)
@@ -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
index fa83cf001a428b78f930114b027d996b9af31db9..b0252de87d738522308201d5a53025d85c8588da 100644 (file)
@@ -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}"
index 31cf3bfa46c59ade350f32e8b20824faabae1d7c..61667b9ba154b78de6ce7287d88fedea3c4977bd 100644 (file)
@@ -40,7 +40,7 @@ MAKETEST="distcheck"
 #
 #
 OPTS=" \
-       --disable-loadable-modules \
+       --enable-loadable-modules \
        --enable-gnuregex \
        --enable-optimizations \
        --enable-inline \
index f5a99d7d0955fa1b7dcd67fbd463f0b7b83b88a2..3ecb25b403bdf90aa1d23012a7980c5696243f26 100644 (file)
@@ -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" \