From 53bfbf591b8cf8affd0c1a075aa6e0275f0d986e Mon Sep 17 00:00:00 2001
From: Marc-Andre Casavant <marc.casavant@inkbridge.io>
Date: Fri, 1 May 2026 13:48:04 -0400
Subject: [PATCH] update valgrind.h path to <valgrind/valgrind.h>

---
 configure                   | 6 +++---
 configure.ac                | 2 +-
 src/include/autoconf.h.in   | 4 ++--
 src/lib/server/dependency.c | 4 ++--
 src/lib/util/dl.c           | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index 91f6ae81c21..a091d39a2df 100755
--- a/configure
+++ b/configure
@@ -8323,10 +8323,10 @@ then :
   printf "%s\n" "#define HAVE_UTMPX_H 1" >>confdefs.h
 
 fi
-ac_fn_c_check_header_compile "$LINENO" "valgrind.h" "ac_cv_header_valgrind_h" "$ac_includes_default"
-if test "x$ac_cv_header_valgrind_h" = xyes
+ac_fn_c_check_header_compile "$LINENO" "valgind/valgrind.h" "ac_cv_header_valgrind_valgrind_h" "$ac_includes_default"
+if test "x$ac_cv_header_valgrind_valgrind_h" = xyes
 then :
-  printf "%s\n" "#define HAVE_VALGRIND_H 1" >>confdefs.h
+  printf "%s\n" "#define HAVE_VALGRIND_VALGRIND_H 1" >>confdefs.h
 
 fi
 
diff --git a/configure.ac b/configure.ac
index d5cb779cec5..8b9087a8054 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1061,7 +1061,7 @@ AC_CHECK_HEADERS( \
   utime.h \
   utmp.h \
   utmpx.h \
-  valgrind.h
+  valgrind/valgrind.h
 )
 
 dnl #
diff --git a/src/include/autoconf.h.in b/src/include/autoconf.h.in
index f78c2ca3f2b..54c0462e809 100644
--- a/src/include/autoconf.h.in
+++ b/src/include/autoconf.h.in
@@ -560,8 +560,8 @@
 /* Define to 1 if you have the <utmp.h> header file. */
 #undef HAVE_UTMP_H
 
-/* Define to 1 if you have the <valgrind.h> header file. */
-#undef HAVE_VALGRIND_H
+/* Define to 1 if you have the <valgrind/valgrind.h> header file. */
+#undef HAVE_VALGRIND_VALGRIND_H
 
 /* Define to 1 if you have the 'vdprintf' function. */
 #undef HAVE_VDPRINTF
diff --git a/src/lib/server/dependency.c b/src/lib/server/dependency.c
index f7d4a46a6e5..be80e598200 100644
--- a/src/lib/server/dependency.c
+++ b/src/lib/server/dependency.c
@@ -54,8 +54,8 @@ static CONF_SECTION *default_version_cs;		//!< Default configuration section to
 #  include <gperftools/profiler.h>
 #endif
 
-#ifdef HAVE_VALGRIND_H
-#  include <valgrind.h>
+#ifdef HAVE_VALGRIND_VALGRIND_H
+#  include <valgrind/valgrind.h>
 #endif
 
 /** Check if the application linking to the library has the correct magic number
diff --git a/src/lib/util/dl.c b/src/lib/util/dl.c
index f357a9be29d..d028e2f58c1 100644
--- a/src/lib/util/dl.c
+++ b/src/lib/util/dl.c
@@ -34,8 +34,8 @@ RCSID("$Id$")
 #include <freeradius-devel/util/syserror.h>
 
 
-#ifdef HAVE_VALGRIND_H
-#  include <valgrind.h>
+#ifdef HAVE_VALGRIND_VALGRIND_H
+#  include <valgrind/valgrind.h>
 #else
 #  define RUNNING_ON_VALGRIND 0
 #endif
-- 
2.47.3