Accept libtool 2.x

diff --git a/bootstrap.sh b/bootstrap.sh
index a208e70dcde3a435f2f6b1f6d385e1b31a428683..01d2122878d5e8b5980ef2b775ea91afdcc9818c 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -9,11 +9,11 @@
 # the command line like "env acver=.. amver=... ./bootstrap.sh"
 acversions="${acver:-2.63 2.62 2.61}"
 amversions="${amver:-1.11 1.10 1.9}"
-ltversions="${ltver:-1.5 1.4}"
+ltversions="${ltver:-2.2 1.5 1.4}"
 
 check_version()
 {
-  eval $2 --version 2>/dev/null | grep -i "$1.*$3" >/dev/null
+  eval $2 --version 2>/dev/null | grep -i "$1.* $3" >/dev/null
 }
 
 show_version()

diff --git a/configure.in b/configure.in
index 4ae4fb8852b3f5415381d1d001a8a2cbd22709a7..fc5a0b0130f33802583d2aee79d38958a76160d1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -63,6 +63,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 fa83cf001a428b78f930114b027d996b9af31db9..b0252de87d738522308201d5a53025d85c8588da 100644 (file)
--- 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 e85113e0bd0750ec8a055a31f3e12dd4a8f81292..ca311846b77f561b4d082edeb52c267cdccfe642 100644 (file)
--- a/test-suite/buildtests/layer-02-maximus.opts
+++ b/test-suite/buildtests/layer-02-maximus.opts
@@ -41,7 +41,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 f5a99d7d0955fa1b7dcd67fbd463f0b7b83b88a2..3ecb25b403bdf90aa1d23012a7980c5696243f26 100644 (file)
--- 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" \