fix to expr #includes; better test-environment configuration

diff --git a/configure.ac b/configure.ac
index 57dde9b35ae116402e3ff352a5378790ba8bfded..e569dc5abced7e3801202dd40e609cd40fad4e3e 100644 (file)
--- 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 88984d286c4f87e4fd36e3eb433736b1f7a305c5..e0451f7a6fe51b3d322cc210a68673358742dbb6 100644 (file)
--- 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 <stdint.h>
-#include "cvc4_expr.h"
 
 namespace CVC4 {