From d17183adf6f8795a2127ec3700185b8528efe04d Mon Sep 17 00:00:00 2001
From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 27 Oct 2009 17:53:38 +1300
Subject: [PATCH] Accept libtool 2.x

---
 bootstrap.sh                                | 4 ++--
 configure.in                                | 5 +++++
 test-suite/buildtests/layer-00-default.opts | 2 +-
 test-suite/buildtests/layer-02-maximus.opts | 2 +-
 test-suite/buildtests/os-debian.opts        | 1 -
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index a208e70dcd..01d2122878 100755
--- 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 4ae4fb8852..fc5a0b0130 100644
--- 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 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 e85113e0bd..ca311846b7 100644
--- 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 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" \
-- 
2.47.3