From cb56555734b5139f779e65cc6e628124ac6796e6 Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Fri, 20 Nov 2009 20:10:43 +0000 Subject: [PATCH] fix to expr #includes; better test-environment configuration --- configure.ac | 9 +++++++++ src/expr/expr_value.h | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 57dde9b35..e569dc5ab 100644 --- a/configure.ac +++ b/configure.ac @@ -68,6 +68,15 @@ AC_ARG_VAR(TEST_CPPFLAGS, [CXXFLAGS to use when testing (default=$CPPFLAGS)]) AC_ARG_VAR(TEST_CXXFLAGS, [CXXFLAGS to use when testing (default=$CXXFLAGS)]) AC_ARG_VAR(TEST_LDFLAGS, [LDFLAGS to use when testing (default=$LDFLAGS)]) +if test -n "$CXXTEST"; then + AC_CHECK_PROG(PERL, perl, perl, []) + if test -z "$PERL"; then + AC_MSG_WARN([unit tests disabled, perl not found.]) + CXXTESTGEN= + CXXTEST= + fi +fi + # Checks for libraries. AC_CHECK_LIB(gmp, __gmpz_init, , [AC_MSG_ERROR([GNU MP not found, see http://gmplib.org/])]) diff --git a/src/expr/expr_value.h b/src/expr/expr_value.h index 88984d286..e0451f7a6 100644 --- a/src/expr/expr_value.h +++ b/src/expr/expr_value.h @@ -14,11 +14,14 @@ ** reference count on ExprValue instances and **/ +/* this must be above the check for __CVC4__EXPR__EXPR_VALUE_H */ +/* to resolve a circular dependency */ +#include "cvc4_expr.h" + #ifndef __CVC4__EXPR__EXPR_VALUE_H #define __CVC4__EXPR__EXPR_VALUE_H #include -#include "cvc4_expr.h" namespace CVC4 { -- 2.30.2