valgrind-tests: Fix LOG_VALGRIND when valgrind is missing.

* m4/valgrind-tests.m4: Clear all variables when missing.

diff --git a/ChangeLog b/ChangeLog
index daeb44ab408e5d87bd7a1931536df1a568141fff..8ab1a4b2a8130086b570ab10f5a95b9edc24e7c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-14  Simon Josefsson  <simon@josefsson.org>
+
+       valgrind-tests: Fix LOG_VALGRIND when valgrind is missing.
+       * m4/valgrind-tests.m4: Clear all variables when missing.
+
 2021-05-14  Simon Josefsson  <simon@josefsson.org>
 
        valgrind-tests: Better option handling.

diff --git a/m4/valgrind-tests.m4 b/m4/valgrind-tests.m4
index 9fc9d5b3782ef9884b1bc37aca58978415be3733..6453430e997638b07d5007b4c05376a0f05713a7 100644 (file)
--- a/m4/valgrind-tests.m4
+++ b/m4/valgrind-tests.m4
@@ -1,4 +1,4 @@
-# valgrind-tests.m4 serial 7
+# valgrind-tests.m4 serial 8
 dnl Copyright (C) 2008-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -79,9 +79,12 @@ AC_DEFUN_ONCE([gl_VALGRIND_TESTS],
            ],
            [gl_cv_prog_valgrind_works=no])
         ])
-      if test $gl_cv_prog_valgrind_works != yes; then
-        VALGRIND=
-      fi
+    fi
+
+    if test $gl_cv_prog_valgrind_works != yes; then
+      VALGRIND=
+      VALGRINDFLAGS=
+      DEFAULT_VALGRINDFLAGS=
     fi
 
    AC_SUBST([LOG_VALGRIND], ["\$(VALGRIND) \$(DEFAULT_VALGRINDFLAGS) \$(VALGRINDFLAGS)"])