don't require libboost_thread (its presence is detected at configure-time), and other build/documentation fixes from yesterday's portfolio merge; resolves bug 302

1 files changed, 28 insertions, 0 deletions

diff --git a/COPYING b/COPYING
index 9d9e116fd..5c6be04c2 100644
--- a/COPYING
+++ b/COPYING
@@ -171,6 +171,34 @@ See config/boost.m4.  Its copyright:
   configuration script generated by Autoconf, you may do so under
   terms of your choice.
 
+CVC4 incorporates some code from Boost (see src/util/channel.h).  This
+is covered by the Boost Software License, version 1.0, available at
+http://www.boost.org/LICENSE_1_0.txt and reprinted below:
+
+  Boost Software License - Version 1.0 - August 17th, 2003
+ 
+  Permission is hereby granted, free of charge, to any person or organization
+  obtaining a copy of the software and accompanying documentation covered by
+  this license (the "Software") to use, reproduce, display, distribute,
+  execute, and transmit the Software, and to prepare derivative works of the
+  Software, and to permit third-parties to whom the Software is furnished to
+  do so, all subject to the following:
+
+  The copyright notices in the Software and this entire statement, including
+  the above license grant, this restriction and the following disclaimer,
+  must be included in all copies of the Software, in whole or in part, and
+  all derivative works of the Software, unless such copies or derivative
+  works are solely in the form of machine-executable object code generated by
+  a source language processor.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+  SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+  FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
+
 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.