diff options
| author | Mathias Preiner <mathias.preiner@gmail.com> | 2018-02-08 07:27:16 -0800 |
|---|---|---|
| committer | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2018-02-08 09:27:16 -0600 |
| commit | aa62cb849687985e499fe28ff18b62938b657e92 (patch) | |
| tree | b595fc2f33f528127bb824f8d21729378ef09da3 /config | |
| parent | e1390a20e15a11b93498a0f23453ea759775662a (diff) | |
Check whether Cryptominisat4/ABC was installed via get-* script. (#1565)
Diffstat (limited to 'config')
| -rw-r--r-- | config/abc.m4 | 13 | ||||
| -rw-r--r-- | config/cryptominisat.m4 | 19 |
2 files changed, 25 insertions, 7 deletions
diff --git a/config/abc.m4 b/config/abc.m4 index faeb68cf2..6f095de7b 100644 --- a/config/abc.m4 +++ b/config/abc.m4 @@ -21,11 +21,20 @@ elif test -n "$with_abc"; then [path to top level of abc source tree] ), [ABC_HOME="$withval"], - [ if test -z "$ABC_HOME"; then - AC_MSG_FAILURE([must give --with-abc-dir=PATH or define environment variable ABC_HOME!]) + [ if test -z "$ABC_HOME" && ! test -e "$ac_abs_confdir/abc/alanmi-abc-53f39c11b58d/arch_flags"; then + AC_MSG_FAILURE([must give --with-abc-dir=PATH, define environment variable ABC_HOME, or use contrib/get-abc to setup ABC for CVC4!]) fi ] ) + # Check if ABC was installed via contrib/get-abc + AC_MSG_CHECKING([whether ABC was already installed via contrib/get-abc]) + if test -z "$ABC_HOME" && test -e "$ac_abs_confdir/abc/alanmi-abc-53f39c11b58d/arch_flags"; then + ABC_HOME="$ac_abs_confdir/abc/alanmi-abc-53f39c11b58d" + AC_MSG_RESULT([yes, $ABC_HOME]) + else + AC_MSG_RESULT([no]) + fi + if ! test -d "$ABC_HOME" || ! test -x "$ABC_HOME/arch_flags"; then AC_MSG_FAILURE([either $ABC_HOME is not an abc source tree or it's not yet built]) fi 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: |