---- valgrind-tests.m4 2018-05-25 10:11:51.767309109 +0200
-+++ valgrind-tests.m4.gnutls 2018-05-25 10:20:02.999088040 +0200
-@@ -12,9 +12,9 @@
+diff --git a/m4/valgrind-tests.m4 b/m4/valgrind-tests.m4
+index 50d90e145..5e198b455 100644
+--- a/m4/valgrind-tests.m4
++++ b/m4/valgrind-tests.m4
+@@ -12,9 +12,9 @@ dnl From Simon Josefsson
AC_DEFUN([gl_VALGRIND_TESTS],
[
AC_ARG_ENABLE([valgrind-tests],
# Run self-tests under valgrind?
if test "$opt_valgrind_tests" = "yes" && test "$cross_compiling" = no; then
-@@ -23,7 +23,7 @@
- if test "$VALGRIND"; then
+@@ -45,7 +45,7 @@ AC_DEFUN([gl_VALGRIND_TESTS],
+ if test -n "$VALGRIND"; then
AC_CACHE_CHECK([for valgrind options for tests],
[gl_cv_opt_valgrind_tests],
-- [gl_cv_opt_valgrind_tests="-q --error-exitcode=1 --leak-check=full"
-+ [gl_cv_opt_valgrind_tests="-q --error-exitcode=1 --leak-check=full --track-origins=yes --gen-suppressions=all --suppressions=\$(srcdir)/suppressions.valgrind"
- $VALGRIND $gl_valgrind_opts ls > /dev/null 2>&1 ||
- gl_cv_opt_valgrind_tests=no])
-
+- [gl_valgrind_opts='-q --error-exitcode=1 --leak-check=full'
++ [gl_valgrind_opts='-q --error-exitcode=1 --leak-check=full --track-origins=yes --gen-suppressions=all --suppressions=\$(srcdir)/suppressions.valgrind'
+ if $VALGRIND $gl_valgrind_opts ls > /dev/null 2>&1; then
+ gl_cv_opt_valgrind_tests="$gl_valgrind_opts"
+ else