Add a mandatory --with-vex option to configure script.

Also, fix a Makefile so that Memcheck's regtests all build again.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3081

diff --git a/configure.in b/configure.in
index 015acc189a0fe83ed06fb451167ba42ade4c2064..568fa579f54b735b0cf8b6f4d4c610713b64b4f3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -6,8 +6,17 @@ AM_INIT_AUTOMAKE
 
 AM_MAINTAINER_MODE
 
-# Where is VEX ? ToDo: --with-vex=
-VEX_DIR=/home/sewardj/VEX/vex/trunk
+# Where is VEX ?
+AC_ARG_WITH(vex, 
+    AS_HELP_STRING([--with-vex], [Vex directory (must be specified!)]),
+[
+    AC_CHECK_FILE($withval/pub/libvex.h,
+        [VEX_DIR=$withval],
+        [AC_MSG_ERROR([Directory '$withval' does not exist, or does not contain Vex])])
+],
+[
+    AC_MSG_ERROR([You must specify --with-vex=<DIR>])
+])
 AC_SUBST(VEX_DIR)
 
 # Checks for programs.

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 9328cc23f0e979b2276a3682accf7b4a5a161c65..f9047869396f375cffa1ec78184dd6d8d7756a24 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -96,7 +96,7 @@ check_PROGRAMS = \
        writev zeropage
 
 
-AM_CPPFLAGS = -I$(top_builddir)/include
+AM_CPPFLAGS = -I$(top_builddir)/include -I@VEX_DIR@/pub
 AM_CFLAGS   = $(WERROR) -Winline -Wall -Wshadow -g 
 AM_CXXFLAGS = $(AM_CFLAGS)