From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Wed, 18 Feb 2009 12:18:04 +0000 (+0100)
Subject: Support libtool2
X-Git-Tag: SQUID_3_2_0_1~1188
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3a6661c774b086de7cfae3916b20ced122bf7ca;p=thirdparty%2Fsquid.git

Support libtool2
---

diff --git a/bootstrap.sh b/bootstrap.sh
index c271b30f75..429d54af85 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -59,15 +59,20 @@ bootstrap_libtoolize() {
     # instead of manualy moving files from ltdl to lib/libLtdl
     if egrep -q '^[[:space:]]*AC_LIBLTDL_' configure.in
     then
-        extras="--ltdl"
+	if libtoolize$ltver --help | grep -q -- --ltdl.=; then
+	    ltdl="--ltdl=lib/libLtdl"
+	else
+	    ltdl="--ltdl"
+	    copy_libltdl=1
+	fi
     else
-        extras=""
+        ltdl=""
     fi
 
-    bootstrap libtoolize$ltver $extras --force --copy --automake
+    bootstrap libtoolize$ltver $ltdl --force --copy --automake
 
     # customize generated libltdl, if any
-    if test -d libltdl
+    if test -d libltdl && [ $copy_libltdl ]
     then
         src=libltdl