From: Morgan Deters <mdeters@gmail.com>
Date: Wed, 17 Feb 2010 19:07:49 +0000 (+0000)
Subject: fix bug 27: --with-cxxtest-dir=(relative-path) now works
X-Git-Tag: cvc5-1.0.0~9248
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2dadba52dd55084bbec52b3b338add5f8be77c13;p=cvc5.git

fix bug 27: --with-cxxtest-dir=(relative-path) now works
---

diff --git a/configure.ac b/configure.ac
index 7b27b8b6f..247aceb92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -331,6 +331,16 @@ AC_ARG_WITH([cxxtest-dir],
   [AS_HELP_STRING([--with-cxxtest-dir=DIR], [path to CxxTest installation])],
   [CXXTEST="$withval"])
 
+# In the case of "./configure --with-cxxtest-dir=../cxxtest" (or other
+# relative path) and having switched the configure directory (see above),
+# search with respect to the top source dir, not the build dir
+if test "$CVC4_CONFIGURE_IN_BUILDS" = yes; then
+  case "$CXXTEST" in
+    /*) ;;
+    *)  CXXTEST="$srcdir/$CXXTEST" ;;
+  esac
+fi
+
 CXXTESTGEN=
 AC_PATH_PROG(CXXTESTGEN, cxxtestgen.pl, [], [$CXXTEST:$PATH])
 if test -z "$CXXTESTGEN"; then