From aa62cb849687985e499fe28ff18b62938b657e92 Mon Sep 17 00:00:00 2001
From: Mathias Preiner <mathias.preiner@gmail.com>
Date: Thu, 8 Feb 2018 07:27:16 -0800
Subject: Check whether Cryptominisat4/ABC was installed via get-* script.
 (#1565)

---
 config/cryptominisat.m4 | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'config/cryptominisat.m4')

diff --git a/config/cryptominisat.m4 b/config/cryptominisat.m4
index e35420edb..2cd48e87d 100644
--- a/config/cryptominisat.m4
+++ b/config/cryptominisat.m4
@@ -7,7 +7,7 @@ AC_MSG_CHECKING([whether user requested cryptominisat support])
 have_libcryptominisat=0
 CRYPTOMINISAT_LIBS=
 CRYPTOMINISAT_LDFLAGS=
-     
+
 have_libcryptominisat=0
 if test "$with_cryptominisat" = no; then
   AC_MSG_RESULT([no, cryptominisat disabled by user])
@@ -20,19 +20,28 @@ elif test -n "$with_cryptominisat"; then
       [--with-cryptominisat-dir=PATH],
       [path to top level of cryptominisat source tree]
     ),
-    [CRYPTOMINISAT_HOME="$withval"],
-    [ if test -z "$CRYPTOMINISAT_HOME"; then
-        AC_MSG_FAILURE([must give --with-cryptominisat-dir=PATH or define environment variable CRYPTOMINISAT_HOME!])
+    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!])
       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"
+    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
     AC_MSG_FAILURE([either $CRYPTOMINISAT_HOME is not an cryptominisat install tree or it's not yet built])
   fi
 
   CPPFLAGS="$CPPFLAGS -I$CRYPTOMINISAT_HOME/install/include"
-  
+
   AC_MSG_CHECKING([how to link cryptominisat])
 
   dnl TODO FIXME:
-- 
cgit v1.2.3