Portability fix: always install libltdl and change autoconf initialization

diff --git a/bootstrap.sh b/bootstrap.sh
index 9a2d1add497b647a1491a3c7f815755c1aad7ce5..0bebfe9e84a17bd09157e79cf0ebf1ea2c6c9683 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -74,14 +74,7 @@ bootstrap() {
 bootstrap_libtoolize() {
     ltver=$1
 
-    # TODO: when we have libtool2, tell libtoolize where to put its files
-    # instead of manualy moving files from ltdl to lib/libLtdl
-    if egrep -q '^[[:space:]]*AC_LIBLTDL_' configure.ac
-    then
-       ltdl="--ltdl"
-    else
-        ltdl=""
-    fi
+    ltdl="--ltdl"
 
     bootstrap libtoolize$ltver $ltdl --force --copy --automake
 

diff --git a/configure.ac b/configure.ac
index b454a7924823c5724bc454b9daf9051090af4401..f9640ff3337d1862ac25a242959491e3f1fd3561 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -47,6 +47,12 @@ fi
 AC_MSG_RESULT($squid_host_os (version $squid_host_os_version))
 # on windows squid_host_os is either mingw or cygwin, version is 32
 
+# this needs to be before any test is run, to have more standard
+# functions available on some Unix sysems (e.g. Solaris)
+if test "x$squid_host_os" = "solaris" -a "x$GCC" != "x" ; then
+       AC_USE_SYSTEM_EXTENSIONS
+fi
+
 # test for programs
 AC_PROG_RANLIB
 AC_PROG_CPP
@@ -78,12 +84,6 @@ AC_PATH_PROG(AR, ar, $FALSE)
 AR_R="$AR r"
 AC_SUBST(AR_R)
 
-# this needs to be before any test is run, to have more standard
-# functions available on some Unix sysems (e.g. Solaris)
-if test "x$squid_host_os" = "solaris" -a "x$GCC" != "x" ; then
-       AC_USE_SYSTEM_EXTENSIONS
-fi
-
 AC_ARG_ENABLE(strict-error-checking,
   AS_HELP_STRING([--disable-strict-error-checking],[By default squid is compiled
                  with all possible static compiler error-checks enabled.
@@ -110,6 +110,7 @@ else
   AC_DISABLE_SHARED
 fi
 
+AC_PROG_LIBTOOL
 LT_INIT([dlopen],[disable-shared])
 if ! test "${ac_top_build_prefix}" = "";
 then