diff options
| author | Mathias Preiner <mathias.preiner@gmail.com> | 2018-03-13 15:47:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-13 15:47:34 -0700 |
| commit | 36512d36ad34d43277443dcbfabf02baa5ad63b4 (patch) | |
| tree | cbb661bab9318f036c032d85c652997701775be0 /config | |
| parent | 10f091e4fc23f80c884520ff484cacb125b45172 (diff) | |
Use Cryptominisat version 5.0.2 (instead of 4.2.0). (#1664)
Diffstat (limited to 'config')
| -rw-r--r-- | config/cryptominisat.m4 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/config/cryptominisat.m4 b/config/cryptominisat.m4 index 2cd48e87d..8f2f5bc51 100644 --- a/config/cryptominisat.m4 +++ b/config/cryptominisat.m4 @@ -21,22 +21,22 @@ elif test -n "$with_cryptominisat"; then [path to top level of cryptominisat source tree] ), CRYPTOMINISAT_HOME="$withval", - [ if test -z "$CRYPTOMINISAT_HOME" && ! test -e "$ac_abs_confdir/cryptominisat4/install/bin/cryptominisat"; then - AC_MSG_FAILURE([must give --with-cryptominisat-dir=PATH, define environment variable CRYPTOMINISAT_HOME, or use contrib/get-cryptominisat4 to setup Cryptominisat4 for CVC4!]) + [ if test -z "$CRYPTOMINISAT_HOME" && ! test -e "$ac_abs_confdir/cryptominisat5/install/bin/cryptominisat5"; then + AC_MSG_FAILURE([must give --with-cryptominisat-dir=PATH, define environment variable CRYPTOMINISAT_HOME, or use contrib/get-cryptominisat to setup cryptominisat5 for CVC4!]) fi ] ) - # Check if cryptominisat4 was installed via contrib/get-cryptominisat4 - AC_MSG_CHECKING([whether Cryptominisat4 was already installed via contrib/get-cryptominisat4]) - if test -z "$CRYPTOMINISAT_HOME" && test -e "$ac_abs_confdir/cryptominisat4/install/bin/cryptominisat"; then - CRYPTOMINISAT_HOME="$ac_abs_confdir/cryptominisat4" + # Check if cryptominisat5 was installed via contrib/get-cryptominisat + AC_MSG_CHECKING([whether cryptominisat5 was already installed via contrib/get-cryptominisat]) + if test -z "$CRYPTOMINISAT_HOME" && test -e "$ac_abs_confdir/cryptominisat5/install/bin/cryptominisat5"; then + CRYPTOMINISAT_HOME="$ac_abs_confdir/cryptominisat5" AC_MSG_RESULT([yes, $CRYPTOMINISAT_HOME]) else AC_MSG_RESULT([no]) fi - if ! test -d "$CRYPTOMINISAT_HOME" || ! test -x "$CRYPTOMINISAT_HOME/install/bin/cryptominisat" ; then + if ! test -d "$CRYPTOMINISAT_HOME" || ! test -x "$CRYPTOMINISAT_HOME/install/bin/cryptominisat5" ; then AC_MSG_FAILURE([either $CRYPTOMINISAT_HOME is not an cryptominisat install tree or it's not yet built]) fi @@ -77,11 +77,11 @@ if test -z "$CRYPTOMINISAT_LIBS"; then cvc4_save_CPPFLAGS="$CPPFLAGS" LDFLAGS="-L$CRYPTOMINISAT_HOME/install/lib" - LIBS="-lcryptominisat4 $1" + LIBS="-lcryptominisat5 $1" AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[#include <cryptominisat4/cryptominisat.h>]], - [[CMSat::SATSolver test()]])], [CRYPTOMINISAT_LIBS="-lcryptominisat4 $1"], + [AC_LANG_PROGRAM([[#include <cryptominisat5/cryptominisat.h>]], + [[CMSat::SATSolver test()]])], [CRYPTOMINISAT_LIBS="-lcryptominisat5 $1"], [CRYPTOMINISAT_LIBS=]) LDFLAGS="$cvc4_save_LDFLAGS" |