Renaming '--bsd' to '--no-gpl' (#3609)

Signed-off-by: Andrew V. Jones <andrew.jones@vector.com>

diff --git a/COPYING b/COPYING
index 77462ae2d616c2f6d33d4e4d803f0d14f4e4660c..d4fc07ed2a12e900ec1867ea2ea4d1ed3317f9c6 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -93,8 +93,8 @@ Please be advised that the following libraries are covered under the GPLv3
 license.  If you choose to link CVC4 against one of these libraries, the
 resulting combined work is also covered under the GPLv3. If you want to make
 sure you build a version of CVC4 that uses no GPLed libraries, configure CVC4
-with the "--bsd" option before building (which is the default).  CVC4 can then
-be used in contexts where you want to use CVC4 under the terms of the
+with the "--no-gpl" option before building (which is the default).  CVC4 can
+then be used in contexts where you want to use CVC4 under the terms of the
 (modified) BSD license.  See licenses/gpl-3.0.txt for more information.
 
 CVC4 can be optionally configured to link against CLN, the Class Library for

diff --git a/contrib/cut-release b/contrib/cut-release
index 224c3b0d9dc5c98724e537714176adee7910b6e7..f13d22298333ba2fff5dd6cb4a00d8b1e76c1b52 100755 (executable)
--- a/contrib/cut-release
+++ b/contrib/cut-release
@@ -249,11 +249,11 @@ if ! $SHELL -c '\
        ./autogen.sh || echo "autoconf failed; does library_versions have something to match $version?"; \
        mkdir "release-$version"; \
        cd "release-$version"; \
-       ../configure production-staticbinary --disable-shared --enable-unit-testing --with-portfolio --bsd '"$configantlr"'; \
+       ../configure production-staticbinary --disable-shared --enable-unit-testing --with-portfolio --no-gpl '"$configantlr"'; \
        make dist '"$makeargs"'; \
        tar xf "cvc4-$version.tar.gz"; \
        cd "cvc4-$version"; \
-       ./configure production-staticbinary --disable-shared --enable-unit-testing --with-portfolio --bsd '"$configantlr"'; \
+       ./configure production-staticbinary --disable-shared --enable-unit-testing --with-portfolio --no-gpl '"$configantlr"'; \
        make check '"$makeargs"'; \
        make distcheck '"$makeargs"'; \
 '; then

diff --git a/src/base/configuration.cpp b/src/base/configuration.cpp
index fb4d94f9dc55e2decdf8fe96144ddd1723a31432..f907f212f1ec91e64ce08a5eefd0dbc3bea29abe 100644 (file)
--- a/src/base/configuration.cpp
+++ b/src/base/configuration.cpp
@@ -126,7 +126,7 @@ std::string Configuration::copyright() {
        << "the GNU General Public License (GPL) version 3.  Versions of CVC4\n"
        << "are available that are covered by the (modified) BSD license. If\n"
        << "you want to license CVC4 under this license, please configure CVC4\n"
-       << "with the \"--bsd\" option before building from sources.\n\n";
+       << "with the \"--no-gpl\" option before building from sources.\n\n";
   } else {
     ss << "CVC4 is open-source and is covered by the BSD license (modified)."
        << "\n\n";