From aab5d996e2099cbba426795519b918e593eb2dbf Mon Sep 17 00:00:00 2001
From: Christian Stimming <stimming@tuhh.de>
Date: Sat, 7 Jan 2006 15:48:53 +0000
Subject: [PATCH] Improve valgrind script

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@12287 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/bin/Makefile.am         | 3 ++-
 src/bin/gnucash-valgrind.in | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index de6a947a86..ee785f0179 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -31,7 +31,8 @@ gnucash-valgrind: gnucash-valgrind.in ${top_builddir}/config.status
 	    -e 's:@-GNC_SCM_INSTALL_DIR-@:${GNC_SCM_INSTALL_DIR}:g' \
             -e 's:@-GNC_LIB_INSTALLDIR-@:${libdir}:' \
             -e 's:@-GNC_PKGLIB_INSTALLDIR-@:${pkglibdir}:g' \
-	    -e 's:@-GNC_MODULE_DIR-@:${GNC_MODULE_DIR}:g'
+	    -e 's:@-GNC_MODULE_DIR-@:${GNC_MODULE_DIR}:g' \
+	    -e "s:@-TOP_SRC_DIR-@:`pwd`/${top_srcdir}:g"
 	mv $@.tmp $@
 	chmod u+x $@
 
diff --git a/src/bin/gnucash-valgrind.in b/src/bin/gnucash-valgrind.in
index c85a61e2a6..58c1848bd8 100644
--- a/src/bin/gnucash-valgrind.in
+++ b/src/bin/gnucash-valgrind.in
@@ -20,14 +20,19 @@ EXTRA_LIBS="${EXTRA_LIBS}:@-G_WRAP_LIB_DIR-@"
 
 LD_LIBRARY_PATH="${EXTRA_LIBS}:${LD_LIBRARY_PATH}"
 LTDL_LIBRARY_PATH="${EXTRA_LIBS}:${LTDL_LIBRARY_PATH}"
+TOP_SRC_DIR="@-TOP_SRC_DIR-@"
 
 export GNC_MODULE_PATH
 export GUILE_LOAD_PATH
 export LD_LIBRARY_PATH
 export LTDL_LIBRARY_PATH
 
+#
+# Other potentially useful options, particularly for valgrind-2.x:
+# --tool=memcheck --trace-children=yes
+#
 exec valgrind -v \
-    --suppressions=./src/valgrind-gnucash.supp  \
+    --suppressions=${TOP_SRC_DIR}/src/valgrind-gnucash.supp  \
     --error-limit=no \
     --tool=callgrind \
     --instr-atstart=no \