Give informative failure messages if you try to use Helgrind or
Addrcheck.  As a results, we are now building Addrcheck again, which
required commenting out lots of code.

BACKPORT TO 3_0_X, AND POSSIBLY TO 2_4_X (the Helgrind part, with
    modifications)



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4384 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/Makefile.am b/Makefile.am
index fd7dbd2..4b19243 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,12 +12,11 @@
 
 ##		addrcheck \
 
-# Temporary: we want to compile Helgrind, but not regtest it.
+# Temporary: we want to compile Helgrind and Addrcheck, but not regtest it.
 # And we want to include Addrcheck in the distro, but not compile/test it.
 # Put docs last because building the HTML is slow and we want to get
 # everything else working before we try it.
-SUBDIRS = 	include coregrind . tests auxprogs $(TOOLS) helgrind docs
-DIST_SUBDIRS =	$(SUBDIRS) addrcheck
+SUBDIRS = 	include coregrind . tests auxprogs $(TOOLS) helgrind addrcheck docs
 
 SUPP_FILES = \
 	glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp \