aboutsummaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-12-23 11:39:48 -0500
committerNick Mathewson <nickm@torproject.org>2014-12-23 11:39:48 -0500
commit45b911b79b66d5df700cd3cae0c7c1dcb9cec843 (patch)
treed77a9956718eeb7a2d186822a19ffe824695a999 /LICENSE
parent6285d9bdcf7f210c56abd25f75133e30d05a7473 (diff)
downloadtor-45b911b79b66d5df700cd3cae0c7c1dcb9cec843.tar.gz
tor-45b911b79b66d5df700cd3cae0c7c1dcb9cec843.zip
Add pkg.m4 to use pkgconfig macros
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE31
1 files changed, 30 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index 7e5094742a..d0fb43a0c3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -191,7 +191,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
DATABASE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===============================================================================
m4/pc_from_ucontext.m4 is available under the following license. Note that
-it is *not* built into the Tor license.
+it is *not* built into the Tor software.
Copyright (c) 2005, Google Inc.
All rights reserved.
@@ -223,6 +223,35 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===============================================================================
+m4/pkg.m4 is available under the following license. Note that
+it is *not* built into the Tor software.
+
+pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+serial 1 (pkg-config-0.24)
+
+Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program 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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+As a special exception to the GNU General Public License, if you
+distribute this file as part of a program that contains a
+configuration script generated by Autoconf, you may include it under
+the same distribution terms that you use for the rest of that program.
+
+
+===============================================================================
If you got Tor as a static binary with OpenSSL included, then you should know:
"This product includes software developed by the OpenSSL Project
for use in the OpenSSL Toolkit (http://www.openssl.org/)"