Further testing quickly found a small bug, pushed. /Simon
From 784fdea59920d69998b59ab326c11a8a2a93ef88 Mon Sep 17 00:00:00 2001 From: Simon Josefsson <si...@josefsson.org> Date: Fri, 14 May 2021 15:03:25 +0200 Subject: [PATCH] valgrind-tests: Fix LOG_VALGRIND when valgrind is missing.
* m4/valgrind-tests.m4: Clear all variables when missing.
---
ChangeLog | 5 +++++
m4/valgrind-tests.m4 | 11 +++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index daeb44ab4..8ab1a4b2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-14 Simon Josefsson <si...@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 <si...@josefsson.org>
valgrind-tests: Better option handling.
diff --git a/m4/valgrind-tests.m4 b/m4/valgrind-tests.m4
index 9fc9d5b37..6453430e9 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)"])
--
2.20.1
signature.asc
Description: PGP signature
