Remove outdated references to TLS (#2245)

diff --git a/AUTHORS b/AUTHORS
index 1d4a67e5bf79db4a9c681a97ad146717b5210122..7f056c0e67d3ce54219291c731bb7a887751443f 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -37,14 +37,8 @@ CVC4 contains MiniSAT code by Niklas Een and Niklas Sorensson.
 The CVC4 parser incorporates some code from ANTLR3, by Jim Idle, Temporal
 Wave LLC.
 
-CVC4 contains the doxygen.m4 autoconf module by Oren Ben-Kiki.
-
-CVC4 contains the pkg.m4 autoconf module by Scott James Remnant.
-
-CVC4 contains the ax_tls.m4 autoconf module by Alan Woodland and Diego Elio
-Petteno`.
-
-CVC4 contains the boost.m4 autoconf module by Benoit Sigoure.
+CVC4 contains various autoconf modules in the config directory. Please refer to
+the individual files for more information on the authors.
 
 CVC4 maintainer versions contain the script autogen.sh by Christopher Sean
 Morrison, and copyright U.S. Army Research Laboratory.

diff --git a/contrib/depgraph b/contrib/depgraph
index 2c4eba59599777f080544966ed869617186fe74b..b0e650f4060a348fd938665297edb11e9fa86f59 100755 (executable)
--- a/contrib/depgraph
+++ b/contrib/depgraph
@@ -88,7 +88,6 @@ for path in $paths; do
     if [ -n "$target" -a "$target" != "$package" ]; then continue; fi
     for inc in $incs; do
       case "$inc" in
-        base/tls.h) inc=base/tls.h.in ;;
         expr/expr.h) inc=expr/expr_template.h ;;
         expr/expr_manager.h) inc=expr/expr_manager_template.h ;;
         expr/kind.h) inc=expr/kind_template.h ;;

diff --git a/src/base/configuration.cpp b/src/base/configuration.cpp
index 68a6ebdb737c2401260417f056aea90c0af5d33f..1a53ccfe9411ac4a01523b19eb92df06079b9468 100644 (file)
--- a/src/base/configuration.cpp
+++ b/src/base/configuration.cpp
@@ -254,10 +254,6 @@ bool Configuration::isBuiltWithReadline() {
   return IS_READLINE_BUILD;
 }
 
-bool Configuration::isBuiltWithTlsSupport() {
-  return USING_TLS;
-}
-
 bool Configuration::isBuiltWithLfsc() {
   return IS_LFSC_BUILD;
 }

diff --git a/src/base/configuration.h b/src/base/configuration.h
index 8b92a6c6712b2c2f3478ba3c3dbe9e71b14d73b3..16c6d7f0d3710d23d77703baaa2d5da617c4618c 100644 (file)
--- a/src/base/configuration.h
+++ b/src/base/configuration.h
@@ -101,8 +101,6 @@ public:
 
   static bool isBuiltWithReadline();
 
-  static bool isBuiltWithTlsSupport();
-
   static bool isBuiltWithLfsc();
 
   static bool isBuiltWithSymFPU();

diff --git a/src/base/configuration_private.h b/src/base/configuration_private.h
index 106b1ff588521d3706be2e67843a1951bc7fd9f3..e2974260cbad05fcd1b0c4692f5df15274aea9bb 100644 (file)
--- a/src/base/configuration_private.h
+++ b/src/base/configuration_private.h
@@ -150,12 +150,6 @@ namespace CVC4 {
 #  define IS_GPL_BUILD false
 #endif /* CVC4_GPL_DEPS */
 
-#ifdef TLS
-#  define USING_TLS true
-#else /* TLS */
-#  define USING_TLS false
-#endif /* TLS */
-
 }/* CVC4 namespace */
 
 #endif /* __CVC4__CONFIGURATION_PRIVATE_H */

diff --git a/src/options/options_handler.cpp b/src/options/options_handler.cpp
index b0e46d8ccff297798eadf09627fcdcfbdd9e0b60..e6b5c320418fd186b1a058fb59223c3b38cef5f4 100644 (file)
--- a/src/options/options_handler.cpp
+++ b/src/options/options_handler.cpp
@@ -1666,7 +1666,6 @@ void OptionsHandler::showConfiguration(std::string option) {
   print_config_cond("lfsc", Configuration::isBuiltWithLfsc());
   print_config_cond("readline", Configuration::isBuiltWithReadline());
   print_config_cond("symfpu", Configuration::isBuiltWithSymFPU());
-  print_config_cond("tls", Configuration::isBuiltWithTlsSupport());
   
   exit(0);
 }

diff --git a/src/smt/smt_engine_scope.cpp b/src/smt/smt_engine_scope.cpp
index 7166f0adecd7bac7b52d842817884bfd980e2d6b..288a07bde832bfd4dfe2d913f7891ac6e13cdec2 100644 (file)
--- a/src/smt/smt_engine_scope.cpp
+++ b/src/smt/smt_engine_scope.cpp
@@ -21,7 +21,6 @@
 #include "base/configuration_private.h"
 #include "base/cvc4_assert.h"
 #include "base/output.h"
-#include "base/tls.h"
 #include "proof/proof.h"
 #include "smt/smt_engine.h"