]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Remove LTDL hack from bootstrap.
authorAmos Jeffries <amosjeffries@squid-cache.org>
Mon, 30 Aug 2010 03:41:04 +0000 (21:41 -0600)
committerAmos Jeffries <amosjeffries@squid-cache.org>
Mon, 30 Aug 2010 03:41:04 +0000 (21:41 -0600)
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.

bootstrap.sh

index 546c8de063b7b78869817aed6a0660f8f6d92935..05e0ef0fdb1cebb434cf9b5ef7b0575160b9b4e1 100755 (executable)
@@ -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
 }