------------------------------------------------------------
revno: 13988
revision-id: squid3@treenet.co.nz-20160215135457-8fj9r6udtb33jqo9
parent: squid3@treenet.co.nz-20160215124256-lp7h6eccs9i6jpym
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Tue 2016-02-16 02:54:57 +1300
message:
  Docs: Clarify libltdl copyright license
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20160215135457-8fj9r6udtb33jqo9
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 1b6b58e8089d51e4dd328ba0cfeafdf9e9ad0b4d
# timestamp: 2016-02-15 14:03:34 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20160215124256-\
#   lp7h6eccs9i6jpym
# 
# Begin patch
=== modified file 'CREDITS'
--- CREDITS	2015-09-27 05:24:31 +0000
+++ CREDITS	2016-02-15 13:54:57 +0000
@@ -1765,6 +1765,34 @@
 
 ==============================================================================
 
+libltdl/:
+
+   Copyright (C) Free Software Foundation, Inc.
+
+GNU Libltdl is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+As a special exception to the GNU Lesser General Public License,
+if you distribute this file as part of a program or library that
+is built using GNU Libtool, you may include this file under the
+same distribution terms that you use for the rest of that program.
+
+GNU Libltdl is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with GNU Libltdl; see the file COPYING.LIB.  If not, a
+copy can be downloaded from  http://www.gnu.org/licenses/lgpl.html,
+or obtained by writing to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+==============================================================================
+
 src/access_log.cc:
 
 mcast_encode() in src/access_log.c is derived from Mark Atkinson's

=== modified file 'bootstrap.sh'
--- bootstrap.sh	2016-01-01 00:14:27 +0000
+++ bootstrap.sh	2016-02-15 13:54:57 +0000
@@ -85,20 +85,6 @@
     ltdl="--ltdl"
 
     bootstrap $tool $ltdl --force --copy --automake
-
-    # customize generated libltdl, if any
-    if test -d libltdl
-    then
-        src=libltdl
-
-        # do not bundle with the huge standard license text
-        rm -f $src/COPYING.LIB
-        makefile=$src/Makefile.in
-        sed 's/COPYING.LIB/ /g' $makefile > $makefile.new;
-        chmod u+w $makefile
-        mv $makefile.new $makefile
-        chmod u-w $makefile
-    fi
 }
 
 # On MAC OS X, GNU libtool is named 'glibtool':