Downgrade ax_valgrind_check

Makefile.in

@@ -177,10 +177,6 @@ am__recursive_targets = \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	cscope distdir distdir-am dist dist-all distcheck
-am__extra_recursive_targets = check-valgrind-recursive \
-	check-valgrind-memcheck-recursive \
-	check-valgrind-helgrind-recursive check-valgrind-drd-recursive \
-	check-valgrind-sgcheck-recursive
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -551,11 +547,6 @@ $(am__recursive_targets):
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
-check-valgrind-local: 
-check-valgrind-memcheck-local: 
-check-valgrind-helgrind-local: 
-check-valgrind-drd-local: 
-check-valgrind-sgcheck-local: 
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
@@ -863,26 +854,6 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-check-valgrind: check-valgrind-recursive
-
-check-valgrind-am: check-valgrind-local
-
-check-valgrind-drd: check-valgrind-drd-recursive
-
-check-valgrind-drd-am: check-valgrind-drd-local
-
-check-valgrind-helgrind: check-valgrind-helgrind-recursive
-
-check-valgrind-helgrind-am: check-valgrind-helgrind-local
-
-check-valgrind-memcheck: check-valgrind-memcheck-recursive
-
-check-valgrind-memcheck-am: check-valgrind-memcheck-local
-
-check-valgrind-sgcheck: check-valgrind-sgcheck-recursive
-
-check-valgrind-sgcheck-am: check-valgrind-sgcheck-local
-
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool mostlyclean-am
@@ -956,12 +927,7 @@ uninstall-am: uninstall-pkgconfigDATA
 .MAKE: $(am__recursive_targets) install-am install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
-	am--refresh check check-am check-valgrind-am \
-	check-valgrind-drd-am check-valgrind-drd-local \
-	check-valgrind-helgrind-am check-valgrind-helgrind-local \
-	check-valgrind-local check-valgrind-memcheck-am \
-	check-valgrind-memcheck-local check-valgrind-sgcheck-am \
-	check-valgrind-sgcheck-local clean clean-cscope clean-generic \
+	am--refresh check check-am clean clean-cscope clean-generic \
 	clean-libtool cscope cscopelist-am ctags ctags-am dist \
 	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
 	dist-xz dist-zip dist-zstd distcheck distclean \

aclocal.m4

@@ -418,23 +418,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
      [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
      [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
 
-# AM_EXTRA_RECURSIVE_TARGETS                                -*- Autoconf -*-
-
-# Copyright (C) 2012-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_EXTRA_RECURSIVE_TARGETS
-# --------------------------
-# Define the list of user recursive targets.  This macro exists only to
-# be traced by Automake, which will ensure that a proper definition of
-# user-defined recursive targets (and associated rules) is propagated
-# into all the generated Makefiles.
-# TODO: We should really reject non-literal arguments here...
-AC_DEFUN([AM_EXTRA_RECURSIVE_TARGETS], [])
-
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996-2021 Free Software Foundation, Inc.

builds/Makefile.in

@@ -127,10 +127,6 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__extra_recursive_targets = check-valgrind-recursive \
-	check-valgrind-memcheck-recursive \
-	check-valgrind-helgrind-recursive check-valgrind-drd-recursive \
-	check-valgrind-sgcheck-recursive
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -414,11 +410,6 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-check-valgrind-local: 
-check-valgrind-memcheck-local: 
-check-valgrind-helgrind-local: 
-check-valgrind-drd-local: 
-check-valgrind-sgcheck-local: 
 tags TAGS:
 
 ctags CTAGS:
@@ -492,26 +483,6 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-check-valgrind: check-valgrind-am
-
-check-valgrind-am: check-valgrind-local
-
-check-valgrind-drd: check-valgrind-drd-am
-
-check-valgrind-drd-am: check-valgrind-drd-local
-
-check-valgrind-helgrind: check-valgrind-helgrind-am
-
-check-valgrind-helgrind-am: check-valgrind-helgrind-local
-
-check-valgrind-memcheck: check-valgrind-memcheck-am
-
-check-valgrind-memcheck-am: check-valgrind-memcheck-local
-
-check-valgrind-sgcheck: check-valgrind-sgcheck-am
-
-check-valgrind-sgcheck-am: check-valgrind-sgcheck-local
-
 clean: clean-am
 
 clean-am: clean-generic clean-libtool mostlyclean-am
@@ -580,12 +551,7 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am check-valgrind-am \
-	check-valgrind-drd-am check-valgrind-drd-local \
-	check-valgrind-helgrind-am check-valgrind-helgrind-local \
-	check-valgrind-local check-valgrind-memcheck-am \
-	check-valgrind-memcheck-local check-valgrind-sgcheck-am \
-	check-valgrind-sgcheck-local clean clean-generic clean-libtool \
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	cscopelist-am ctags-am distclean distclean-generic \
 	distclean-libtool distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \

configure

@@ -1551,6 +1551,7 @@ Optional Features:
   --enable-opt            Optimize for the native CPU - The resulting library
                           will be faster but not portable
   --enable-valgrind       Whether to enable Valgrind on the unit tests
+                          (requires GNU make)
   --disable-valgrind-memcheck
                           Whether to skip memcheck during the Valgrind tests
   --disable-valgrind-helgrind
@@ -7282,15 +7283,12 @@ fi
 
 
 
-
-
-
 		# Check whether --enable-valgrind was given.
 if test ${enable_valgrind+y}
 then :
   enableval=$enable_valgrind; enable_valgrind=$enableval
 else $as_nop
-  enable_valgrind=
+  enable_valgrind=no
 fi
 
 
@@ -7669,7 +7667,7 @@ valgrind_quiet_ = $(valgrind_quiet_$(AM_DEFAULT_VERBOSITY))
 valgrind_quiet_0 = --quiet
 valgrind_v_use   = $(valgrind_v_use_$(V))
 valgrind_v_use_  = $(valgrind_v_use_$(AM_DEFAULT_VERBOSITY))
-valgrind_v_use_0 = @echo "  USE   " $(patsubst check-valgrind-%-local,%,$''@):;
+valgrind_v_use_0 = @echo "  USE   " $(patsubst check-valgrind-%,%,$''@):;
 
 # Support running with and without libtool.
 ifneq ($(LIBTOOL),)
@@ -7679,12 +7677,12 @@ valgrind_lt =
 endif
 
 # Use recursive makes in order to ignore errors during check
-check-valgrind-local:
+check-valgrind:
 ifeq ($(VALGRIND_ENABLED),yes)
 	$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k \
 		$(foreach tool, $(valgrind_enabled_tools), check-valgrind-$(tool))
 else
-	@echo "Need to reconfigure with --enable-valgrind"
+	@echo "Need to use GNU make and reconfigure with --enable-valgrind"
 endif
 
 # Valgrind running
@@ -7698,16 +7696,14 @@ VALGRIND_LOG_COMPILER = \
 	$(valgrind_lt) \
 	$(VALGRIND) $(VALGRIND_SUPPRESSIONS) --error-exitcode=1 $(VALGRIND_FLAGS)
 
-define valgrind_tool_rule
-check-valgrind-$(1)-local:
+define valgrind_tool_rule =
+check-valgrind-$(1):
 ifeq ($$(VALGRIND_ENABLED)-$$(ENABLE_VALGRIND_$(1)),yes-yes)
-ifneq ($$(TESTS),)
 	$$(valgrind_v_use)$$(MAKE) check-TESTS \
 		TESTS_ENVIRONMENT="$$(VALGRIND_TESTS_ENVIRONMENT)" \
 		LOG_COMPILER="$$(VALGRIND_LOG_COMPILER)" \
 		LOG_FLAGS="$$(valgrind_$(1)_flags)" \
 		TEST_SUITE_LOG=test-suite-$(1).log
-endif
 else ifeq ($$(VALGRIND_ENABLED),yes)
 	@echo "Need to reconfigure with --enable-valgrind-$(1)"
 else
@@ -7723,9 +7719,18 @@ A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-valgrind
 MOSTLYCLEANFILES ?=
 MOSTLYCLEANFILES += $(valgrind_log_files)
 
-.PHONY: check-valgrind $(addprefix check-valgrind-,$(valgrind_tools))
+.PHONY: check-valgrind $(add-prefix check-valgrind-,$(valgrind_tools))
 '
 
+	if test "$enable_valgrind" != "yes"
+then :
+
+		VALGRIND_CHECK_RULES='
+check-valgrind:
+	@echo "Need to use GNU make and reconfigure with --enable-valgrind"'
+
+fi
+
 
 
 

contrib/Makefile.in

@@ -127,10 +127,6 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__extra_recursive_targets = check-valgrind-recursive \
-	check-valgrind-memcheck-recursive \
-	check-valgrind-helgrind-recursive check-valgrind-drd-recursive \
-	check-valgrind-sgcheck-recursive
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -344,11 +340,6 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-check-valgrind-local: 
-check-valgrind-memcheck-local: 
-check-valgrind-helgrind-local: 
-check-valgrind-drd-local: 
-check-valgrind-sgcheck-local: 
 tags TAGS:
 
 ctags CTAGS:
@@ -422,26 +413,6 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-check-valgrind: check-valgrind-am
-
-check-valgrind-am: check-valgrind-local
-
-check-valgrind-drd: check-valgrind-drd-am
-
-check-valgrind-drd-am: check-valgrind-drd-local
-
-check-valgrind-helgrind: check-valgrind-helgrind-am
-
-check-valgrind-helgrind-am: check-valgrind-helgrind-local
-
-check-valgrind-memcheck: check-valgrind-memcheck-am
-
-check-valgrind-memcheck-am: check-valgrind-memcheck-local
-
-check-valgrind-sgcheck: check-valgrind-sgcheck-am
-
-check-valgrind-sgcheck-am: check-valgrind-sgcheck-local
-
 clean: clean-am
 
 clean-am: clean-generic clean-libtool mostlyclean-am
@@ -510,12 +481,7 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am check-valgrind-am \
-	check-valgrind-drd-am check-valgrind-drd-local \
-	check-valgrind-helgrind-am check-valgrind-helgrind-local \
-	check-valgrind-local check-valgrind-memcheck-am \
-	check-valgrind-memcheck-local check-valgrind-sgcheck-am \
-	check-valgrind-sgcheck-local clean clean-generic clean-libtool \
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	cscopelist-am ctags-am distclean distclean-generic \
 	distclean-libtool distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \

dist-build/Makefile.in

@@ -127,10 +127,6 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__extra_recursive_targets = check-valgrind-recursive \
-	check-valgrind-memcheck-recursive \
-	check-valgrind-helgrind-recursive check-valgrind-drd-recursive \
-	check-valgrind-sgcheck-recursive
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -358,11 +354,6 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-check-valgrind-local: 
-check-valgrind-memcheck-local: 
-check-valgrind-helgrind-local: 
-check-valgrind-drd-local: 
-check-valgrind-sgcheck-local: 
 tags TAGS:
 
 ctags CTAGS:
@@ -436,26 +427,6 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-check-valgrind: check-valgrind-am
-
-check-valgrind-am: check-valgrind-local
-
-check-valgrind-drd: check-valgrind-drd-am
-
-check-valgrind-drd-am: check-valgrind-drd-local
-
-check-valgrind-helgrind: check-valgrind-helgrind-am
-
-check-valgrind-helgrind-am: check-valgrind-helgrind-local
-
-check-valgrind-memcheck: check-valgrind-memcheck-am
-
-check-valgrind-memcheck-am: check-valgrind-memcheck-local
-
-check-valgrind-sgcheck: check-valgrind-sgcheck-am
-
-check-valgrind-sgcheck-am: check-valgrind-sgcheck-local
-
 clean: clean-am
 
 clean-am: clean-generic clean-libtool mostlyclean-am
@@ -524,12 +495,7 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am check-valgrind-am \
-	check-valgrind-drd-am check-valgrind-drd-local \
-	check-valgrind-helgrind-am check-valgrind-helgrind-local \
-	check-valgrind-local check-valgrind-memcheck-am \
-	check-valgrind-memcheck-local check-valgrind-sgcheck-am \
-	check-valgrind-sgcheck-local clean clean-generic clean-libtool \
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	cscopelist-am ctags-am distclean distclean-generic \
 	distclean-libtool distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \