diff --git a/configure.in b/configure.in
index 4c28a3a..731b29b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_INIT(vg_clientmalloc.c)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(valgrind, 1.0.0)
+AM_INIT_AUTOMAKE(valgrind, post-1.0.0-ERASER)
 
 AM_MAINTAINER_MODE
 
@@ -11,6 +11,7 @@
 AC_PROG_LN_S
 AC_PROG_CC
 AC_PROG_CPP
+AC_PROG_CXX
 AC_PROG_RANLIB
 
 # Check for the compiler support
@@ -293,10 +294,13 @@
    vg_annotate
    valgrind
    valgrind.spec
-   cachegrind
    Makefile 
    docs/Makefile 
    tests/Makefile 
+   tests/cachesim/Makefile 
+   tests/corecheck/Makefile 
+   tests/none/Makefile 
+   tests/memcheck/Makefile 
    demangle/Makefile)
 
 cat<<EOF