From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Mon, 30 Aug 2010 03:41:04 +0000 (-0600)
Subject: Remove LTDL hack from bootstrap.
X-Git-Tag: take1~316
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8b3efc297e090152ba9b9fd924684371c68d685;p=thirdparty%2Fsquid.git

Remove LTDL hack from bootstrap.

Now confirmed and tested the correct use of -I paths to enable Squid
to build on systems with older libtool versions. The hack forcing local
headers to be used is no longer required.
---

diff --git a/bootstrap.sh b/bootstrap.sh
index 546c8de063..05e0ef0fdb 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -113,19 +113,6 @@ bootstrap_libtoolize() {
         chmod u+w $makefile
         mv $makefile.new $makefile
         chmod u-w $makefile
-
-        # Libtool 2.2.6b we bundle is slightly broken with non-portable dependencies
-        # HACK: Make it backward-compatible by linking the bundled headers.
-        for f in ltdl.h libltdl/lt_error.h libltdl/lt_system.h libltdl/lt_dlloader.h libltdl/slist.h; do
-            echo "Fixing $f ..."
-            sed 's/<libltdl\/lt_system.h>/\"libltdl\/lt_system.h\"/g' $src/$f |
-                sed 's/<libltdl\/lt__glibc.h>/\"libltdl\/lt__glibc.h\"/g' |
-                sed 's/<libltdl\/lt_error.h>/\"libltdl\/lt_error.h\"/g' |
-                sed 's/<libltdl\/lt_dlloader.h>/\"libltdl\/lt_dlloader.h\"/g' > $src/$f.new;
-            chmod u+w $src/$f
-            mv $src/$f.new $src/$f
-            chmod u-w $src/$f
-        done
     fi
 }