Fix CryptoMiniSat config to allow system versions. (#2223)

diff --git a/config/cryptominisat.m4 b/config/cryptominisat.m4
index a0878f0265b55205a420a78185e0da201ea9a2ae..8ad4d4a0f6a4f6a787124d79787d8150afbfc0a0 100644 (file)
--- 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(

diff --git a/configure.ac b/configure.ac
index d1545febe9ded57f08297398e3629ac5fc6cee49..9ec9923c0c7e380124e96006abd9b5151ec68ac3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -913,7 +913,7 @@ AC_ARG_WITH([cryptominisat],
 CVC4_CHECK_FOR_CRYPTOMINISAT
 if test $have_libcryptominisat -eq 1; then
   CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-DCVC4_USE_CRYPTOMINISAT"
-  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-I$CRYPTOMINISAT_HOME/install/include"
+  CVC4CPPFLAGS="${CVC4CPPFLAGS:+$CVC4CPPFLAGS }-I$CRYPTOMINISAT_HOME/include"
 fi
 AM_CONDITIONAL([CVC4_USE_CRYPTOMINISAT], [test $have_libcryptominisat -eq 1])
 AC_SUBST([CRYPTOMINISAT_LDFLAGS])