From f1078bd68ea78333bcb725f93bb3a8fdd0857c0f Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Sat, 26 Sep 2015 20:52:12 -0700 Subject: [PATCH] Docs: Clarify libltdl as licensed under LGPLv2+ --- CREDITS | 28 ++++++++++++++++++++++++++++ bootstrap.sh | 14 -------------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/CREDITS b/CREDITS index 24b23c6699..cb6752be17 100644 --- a/CREDITS +++ b/CREDITS @@ -1799,6 +1799,34 @@ lib/Splay.cc: * based on ftp://ftp.cs.cmu.edu/user/sleator/splaying/top-down-splay.c * http://bobo.link.cs.cmu.edu/cgi-bin/splay/splay-cgi.pl +============================================================================== + +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: diff --git a/bootstrap.sh b/bootstrap.sh index 25f68ef475..c094b556e7 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -85,20 +85,6 @@ bootstrap_libtoolize() { 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': -- 2.39.2