portfolio merge

1 files changed, 26 insertions, 0 deletions

diff --git a/COPYING b/COPYING
index bcb21aa3d..9d9e116fd 100644
--- a/COPYING
+++ b/COPYING
@@ -145,6 +145,32 @@ See config/ax_tls.m4.  Its copyright:
   modified version of the Autoconf Macro, you may extend this special
   exception to the GPL to apply to your modified version as well.
 
+CVC4 incorporates the m4 macro file "boost.m4", excluded from the above
+copyright and downloaded from http://github.com/tsuna/boost.m4 .
+See config/boost.m4.  Its copyright:
+
+  Copyright (C) 2007  Benoit Sigoure <tsuna@lrde.epita.fr>
+
+  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 3 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, see <http://www.gnu.org/licenses/>.
+
+  Additional permission under section 7 of the GNU General Public
+  License, version 3 ("GPLv3"):
+
+  If you convey this file as part of a work that contains a
+  configuration script generated by Autoconf, you may do so under
+  terms of your choice.
+
 CVC4 incorporates code from ANTLR3, excluded from the above copyright.
 See http://www.antlr.org/, and the files src/parser/bounded_token_buffer.h,
 src/parser/bounded_token_buffer.cpp, and src/parser/antlr_input_imports.cpp.