[applied] configure: Fix xxhash detection code

Message ID 874j1bjc2o.fsf@redhat.com
State New
Headers
Series [applied] configure: Fix xxhash detection code |

Commit Message

Dodji Seketeli Feb. 3, 2025, 3:13 p.m. UTC
  Hello,

While looking at something else, I realized that the xxhash
detection/configuration code in the configure machinery doesn't
substitute (in the Makefiles) the XXHASH_CFLAGS and XXHASH_LIBS
variables that it computed.  It doesn't include those values in the
DEPS_CPPFLAGS and DEPS_LIBS variables either.

Fixed thus.

	* configure.ac: Substitute XXHASH_CFLAGS and XXHASH_LIBS in the
	Makefiles.  Add XXHASH_CFLAGS to DEPS_CPPFLAGS and XXHASH_LIBS to
	DEPS_LIBS.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
Applied to the mainline.
---
 configure.ac | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
  

Patch

diff --git a/configure.ac b/configure.ac
index e6adfb79..3af29d77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -527,6 +527,9 @@  AC_SUBST(XML_CFLAGS)
 dnl Check for dependency: xxhash
 XXHASH_VERSION=0.8.0
 PKG_CHECK_MODULES(XXHASH, libxxhash >= $XXHASH_VERSION)
+AC_SUBST(XXHASH_CFLAGS)
+AC_SUBST(XXHASH_LIBS)
+
 
 dnl Check for some programs like rm, mkdir, etc ...
 AC_CHECK_PROG(HAS_RM, rm, yes, no)
@@ -909,7 +912,7 @@  AM_CONDITIONAL(ENABLE_RUNNING_TESTS_WITH_PY3, test x$RUN_TESTS_WITH_PY3 = xyes)
 AM_CONDITIONAL(ENABLE_PYTHON3_INTERPRETER, test x$PYTHON3_INTERPRETER != xno)
 AC_SUBST(PYTHON)
 
-DEPS_CPPFLAGS="$XML_CFLAGS"
+DEPS_CPPFLAGS="$XML_CFLAGS $XXHASH_CFLAGS"
 AC_SUBST(DEPS_CPPFLAGS)
 
 dnl Check for the presence of doxygen program
@@ -951,7 +954,7 @@  AX_VALGRIND_CHECK
 
 dnl Set the list of libraries libabigail depends on
 
-DEPS_LIBS="$XML_LIBS $ELF_LIBS $DW_LIBS $CTF_LIBS $BPF_LIBS"
+DEPS_LIBS="$XML_LIBS $ELF_LIBS $DW_LIBS $CTF_LIBS $BPF_LIBS XXHASH_LIBS"
 AC_SUBST(DEPS_LIBS)
 
 if test x$ABIGAIL_DEVEL != x; then