From: Simon Josefsson <simon@josefsson.org>
Date: Fri, 14 May 2021 13:03:25 +0000 (+0200)
Subject: valgrind-tests: Fix LOG_VALGRIND when valgrind is missing.
X-Git-Tag: v1.0~2892
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=784fdea59920d69998b59ab326c11a8a2a93ef88;p=thirdparty%2Fgnulib.git

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 daeb44ab40..8ab1a4b2a8 100644
--- 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 9fc9d5b378..6453430e99 100644
--- 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)"])