merge trunk into branch rootsunityrootsunity

git-svn-id: svn://scm.gforge.inria.fr/svn/mpc/branches/rootsunity@1273 211d60ee-9f03-0410-a15a-8952a2c7a4e4

1 files changed, 10 insertions, 6 deletions

diff --git a/m4/valgrind-tests.m4 b/m4/valgrind-tests.m4
index 926d75c..e38236e 100644
--- a/m4/valgrind-tests.m4
+++ b/m4/valgrind-tests.m4
@@ -5,25 +5,29 @@ dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Simon Josefsson
+dnl with adaptations to MPC
 
 # gl_VALGRIND_TESTS()
 # -------------------
 # Check if valgrind is available, and set VALGRIND to it if available.
 AC_DEFUN([gl_VALGRIND_TESTS],
 [
-  AC_ARG_ENABLE(valgrind-tests,
-    AS_HELP_STRING([--enable-valgrind-tests],
-                   [run self tests under valgrind]),
-    [opt_valgrind_tests=$enableval], [opt_valgrind_tests=yes])
-
   # Run self-tests under valgrind?
-  if test "$opt_valgrind_tests" = "yes" && test "$cross_compiling" = no; then
+  if test "$cross_compiling" = no; then
     AC_CHECK_PROGS(VALGRIND, valgrind)
   fi
 
   if test -n "$VALGRIND" && $VALGRIND -q true > /dev/null 2>&1; then
     opt_valgrind_tests=yes
     VALGRIND="$VALGRIND -q --error-exitcode=1 --leak-check=full"
+# Addition AE: enable suppression file through a shell variable
+    AC_MSG_CHECKING([for valgrind suppression file])
+    if test -n "$VALGRIND_SUPPRESSION"; then
+       AC_MSG_RESULT($VALGRIND_SUPPRESSION)
+       VALGRIND="$VALGRIND --suppressions=$VALGRIND_SUPPRESSION"
+    else
+       AC_MSG_RESULT([no])
+    fi
     AC_DEFINE([MPC_USE_VALGRIND], 1, [Use valgrind for make check])
   else
     opt_valgrind_tests=no