From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Mon, 5 Jul 2010 11:34:15 +0000 (-0600)
Subject: Better bug 2972 fix.
X-Git-Tag: SQUID_3_2_0_1~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cacd452181ed386dbc7b004ae9a2948906cac3e1;p=thirdparty%2Fsquid.git

Better bug 2972 fix.

sed the includes explicitly. Previous run worked unless code was actually
bootstrapped to an older libtool version.
---

diff --git a/bootstrap.sh b/bootstrap.sh
index c60fb0d963..3136a4d75f 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -103,8 +103,12 @@ bootstrap_libtoolize() {
         chmod u-w $makefile
 
         # Libtool 2.2.6b we bundle is slightly broken with non-portable dependencies
-        sed 's/<libltdl/\"libltdl/g' $src/ltdl.h | sed 's/.h>/.h\"/g' > $src/ltdl.h.new;
+        sed 's/<libltdl\/lt_system.h>/\"libltdl\/lt_system.h\"/g' $src/ltdl.h |
+            sed 's/<libltdl\/lt_error.h>/\"libltdl\/lt_error.h\"/g' |
+            sed 's/<libltdl\/lt_dlloader.h>/\"libltdl\/lt_dlloader.h\"/g' > $src/ltdl.h.new;
+        chmod u+w $src/ltdl.h
         mv $src/ltdl.h.new $src/ltdl.h
+        chmod u-w $src/ltdl.h
     fi
 }