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 eabc7156420e2fb0d36f5ee97349f2ffa47f1ead..8f9ff0ee6ac79cdec666a972b70bf55dc3c697ee 100644 (file)
--- 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 55fa7a6ad0359e14626ad6ee63f4b1438f97ad92..85660f223c8e2795798a3701426bae00b90abeb1 100644 (file)
--- 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 90e560962733f571992f28c180e9b9aab9fbc4cf..196290b53a22e2369e462ad3dffeb42ab9b0f206 100644 (file)
--- 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 9a6abdb53a0c12512e2e11d07b7fa702b98a51e9..31c7b654733db650d860dd6e25a6bbcd0852538e 100644 (file)
--- 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 87dc1ecc17b7a7c2b731aa57b53c7d10a908d5cc..9adff0d3d2b5f87f8861e1853bf1d2b35b436ecc 100644 (file)
--- 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);
 }