From: Mathias Preiner <mathias.preiner@gmail.com>
Date: Tue, 3 Oct 2017 23:09:38 +0000 (-0700)
Subject: Add Cryptominisat and LFSC to --show-config output. (#1194)
X-Git-Tag: cvc5-1.0.0~5582
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b01ea5105589569428be93d121e02ae0c933aef3;p=cvc5.git

Add Cryptominisat and LFSC to --show-config output. (#1194)

Also removed obsolete CUDD related code.
---

diff --git a/config/lfsc.m4 b/config/lfsc.m4
index eabc71564..8f9ff0ee6 100644
--- a/config/lfsc.m4
+++ b/config/lfsc.m4
@@ -8,7 +8,6 @@ have_liblfsc=0
 LFSC_LIBS=
 LFSC_LDFLAGS=
 
-have_liblfsc=0
 if test "$with_lfsc" = no; then
   AC_MSG_RESULT([no, LFSC disabled by user])
 elif test -n "$with_lfsc"; then
diff --git a/configure.ac b/configure.ac
index 55fa7a6ad..85660f223 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1512,9 +1512,11 @@ Bindings     : $bindings_to_be_built
 Multithreaded: $support_multithreaded
 Portfolio    : $with_portfolio
 
-MP library   : $mplibrary
-GLPK         : $with_glpk
 ABC          : $with_abc
+Cryptominisat: $with_cryptominisat
+GLPK         : $with_glpk
+LFSC         : $with_lfsc
+MP library   : $mplibrary
 Readline     : $with_readline
 
 CPPFLAGS     : $CPPFLAGS
diff --git a/src/base/configuration.cpp b/src/base/configuration.cpp
index 90e560962..196290b53 100644
--- a/src/base/configuration.cpp
+++ b/src/base/configuration.cpp
@@ -142,14 +142,14 @@ bool Configuration::isBuiltWithReadline() {
   return IS_READLINE_BUILD;
 }
 
-bool Configuration::isBuiltWithCudd() {
-  return false;
-}
-
 bool Configuration::isBuiltWithTlsSupport() {
   return USING_TLS;
 }
 
+bool Configuration::isBuiltWithLfsc() {
+  return IS_LFSC_BUILD;
+}
+
 unsigned Configuration::getNumDebugTags() {
 #if defined(CVC4_DEBUG) && defined(CVC4_TRACING)
   /* -1 because a NULL pointer is inserted as the last value */
diff --git a/src/base/configuration.h b/src/base/configuration.h
index 9a6abdb53..31c7b6547 100644
--- a/src/base/configuration.h
+++ b/src/base/configuration.h
@@ -97,10 +97,10 @@ public:
 
   static bool isBuiltWithReadline();
 
-  static bool isBuiltWithCudd();
-
   static bool isBuiltWithTlsSupport();
 
+  static bool isBuiltWithLfsc();
+
   /* Return the number of debug tags */
   static unsigned getNumDebugTags();
   /* Return a sorted array of the debug tags name */
diff --git a/src/options/options_handler.cpp b/src/options/options_handler.cpp
index 87dc1ecc1..9adff0d3d 100644
--- a/src/options/options_handler.cpp
+++ b/src/options/options_handler.cpp
@@ -1409,13 +1409,14 @@ void OptionsHandler::showConfiguration(std::string option) {
   printf("profiling  : %s\n", Configuration::isProfilingBuild() ? "yes" : "no");
   printf("competition: %s\n", Configuration::isCompetitionBuild() ? "yes" : "no");
   printf("\n");
-  printf("cudd       : %s\n", Configuration::isBuiltWithCudd() ? "yes" : "no");
-  printf("cln        : %s\n", Configuration::isBuiltWithCln() ? "yes" : "no");
-  printf("gmp        : %s\n", Configuration::isBuiltWithGmp() ? "yes" : "no");
-  printf("glpk       : %s\n", Configuration::isBuiltWithGlpk() ? "yes" : "no");
-  printf("abc        : %s\n", Configuration::isBuiltWithAbc() ? "yes" : "no");
-  printf("readline   : %s\n", Configuration::isBuiltWithReadline() ? "yes" : "no");
-  printf("tls        : %s\n", Configuration::isBuiltWithTlsSupport() ? "yes" : "no");
+  printf("abc          : %s\n", Configuration::isBuiltWithAbc() ? "yes" : "no");
+  printf("cln          : %s\n", Configuration::isBuiltWithCln() ? "yes" : "no");
+  printf("glpk         : %s\n", Configuration::isBuiltWithGlpk() ? "yes" : "no");
+  printf("cryptominisat: %s\n", Configuration::isBuiltWithCryptominisat() ? "yes" : "no");
+  printf("gmp          : %s\n", Configuration::isBuiltWithGmp() ? "yes" : "no");
+  printf("lfsc         : %s\n", Configuration::isBuiltWithLfsc() ? "yes" : "no");
+  printf("readline     : %s\n", Configuration::isBuiltWithReadline() ? "yes" : "no");
+  printf("tls          : %s\n", Configuration::isBuiltWithTlsSupport() ? "yes" : "no");
   exit(0);
 }