diff options
| author | Andres Noetzli <andres.noetzli@gmail.com> | 2018-06-07 13:56:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-07 13:56:06 -0700 |
| commit | e0bdf8d71dca4af530273ede2bdd252ca6d8e6b1 (patch) | |
| tree | 395661187380bd9f8f2866ba31f7b19c93efce3d /config | |
| parent | 98b41576dcaaa3a6f935613fb7cc9065f4b3b813 (diff) | |
Look for cryptominisat5_simple, not cryptominisat5 (#2058)
If the boost program_options library is missing, CryptoMiniSat5 only
builds a cryptominisat5_simple binary and omits the cryptominisat5,
which has more command-line options. We do not use the binary anyway, so
this commit changes the cryptominisat.m4 script to look for the
cryptominisat5_simple binary, which is always generated.
Diffstat (limited to 'config')
| -rw-r--r-- | config/cryptominisat.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/cryptominisat.m4 b/config/cryptominisat.m4 index 7ddb895b5..a0878f026 100644 --- a/config/cryptominisat.m4 +++ b/config/cryptominisat.m4 @@ -21,7 +21,7 @@ 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/cryptominisat5/install/bin/cryptominisat5"; then + [ if test -z "$CRYPTOMINISAT_HOME" && ! test -e "$ac_abs_confdir/cryptominisat5/install/bin/cryptominisat5_simple"; 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 ] @@ -29,14 +29,14 @@ elif test -n "$with_cryptominisat"; then # 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 + if test -z "$CRYPTOMINISAT_HOME" && test -e "$ac_abs_confdir/cryptominisat5/install/bin/cryptominisat5_simple"; 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/cryptominisat5" ; then + if ! test -d "$CRYPTOMINISAT_HOME" || ! test -x "$CRYPTOMINISAT_HOME/install/bin/cryptominisat5_simple" ; then AC_MSG_FAILURE([either $CRYPTOMINISAT_HOME is not an cryptominisat install tree or it's not yet built]) fi |