diff options
| author | Mathias Preiner <mathias.preiner@gmail.com> | 2018-07-26 19:56:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-26 19:56:44 -0700 |
| commit | bf30407a9f4eb1077a64b495a7333382a008437c (patch) | |
| tree | 8819d52344a635ff1e405c1fc0facfd9e045757b /config/cryptominisat.m4 | |
| parent | 7205a170a25960561078a0718441a7ec7714607b (diff) | |
Fix CryptoMiniSat config to allow system versions. (#2223)
Diffstat (limited to 'config/cryptominisat.m4')
| -rw-r--r-- | config/cryptominisat.m4 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config/cryptominisat.m4 b/config/cryptominisat.m4 index a0878f026..8ad4d4a0f 100644 --- a/config/cryptominisat.m4 +++ b/config/cryptominisat.m4 @@ -30,13 +30,13 @@ 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_simple"; then - CRYPTOMINISAT_HOME="$ac_abs_confdir/cryptominisat5" + CRYPTOMINISAT_HOME="$ac_abs_confdir/cryptominisat5/install" AC_MSG_RESULT([yes, $CRYPTOMINISAT_HOME]) else AC_MSG_RESULT([no]) fi - if ! test -d "$CRYPTOMINISAT_HOME" || ! test -x "$CRYPTOMINISAT_HOME/install/bin/cryptominisat5_simple" ; then + if ! test -d "$CRYPTOMINISAT_HOME" || ! test -x "$CRYPTOMINISAT_HOME/bin/cryptominisat5_simple" ; then AC_MSG_FAILURE([either $CRYPTOMINISAT_HOME is not an cryptominisat install tree or it's not yet built]) fi @@ -54,7 +54,7 @@ elif test -n "$with_cryptominisat"; then have_libcryptominisat=1 fi - CRYPTOMINISAT_LDFLAGS="-L$CRYPTOMINISAT_HOME/install/lib" + CRYPTOMINISAT_LDFLAGS="-L$CRYPTOMINISAT_HOME/lib" else AC_MSG_RESULT([no, user didn't request cryptominisat]) @@ -74,8 +74,8 @@ if test -z "$CRYPTOMINISAT_LIBS"; then cvc4_save_LDFLAGS="$LDFLAGS" cvc4_save_CPPFLAGS="$CPPFLAGS" - LDFLAGS="-L$CRYPTOMINISAT_HOME/install/lib" - CPPFLAGS="$CPPFLAGS -I$CRYPTOMINISAT_HOME/install/include" + LDFLAGS="-L$CRYPTOMINISAT_HOME/lib" + CPPFLAGS="$CPPFLAGS -I$CRYPTOMINISAT_HOME/include" LIBS="-lcryptominisat5 $1" AC_LINK_IFELSE( |