From d2b700d7af1916637e74f912cea2c41ceda4645c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 25 Jul 2021 18:35:59 +0200 Subject: [PATCH 1/2] build/libmaxmind.m4: fix build with host-pkgconf Build with maxminddb is broken since version 3.0.5 and https://github.com/SpiderLabs/ModSecurity/commit/785958f9b5089b918c7d054cbcc2fe4a3c7b3788 because libmaxminddb has been removed from MAXMIND_POSSIBLE_LIB_NAMES So, as suggested by Arnout in #2131, don't use MAXMIND_POSSIBLE_LIB_NAMES for pkg-config, because it was never called anything other than libmaxminddb Signed-off-by: Fabrice Fontaine --- build/libmaxmind.m4 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/build/libmaxmind.m4 b/build/libmaxmind.m4 index 656fc250..7eafc4d5 100644 --- a/build/libmaxmind.m4 +++ b/build/libmaxmind.m4 @@ -60,12 +60,10 @@ else # Nothing about MaxMind was informed, using the pkg-config to figure things out. if test -n "${PKG_CONFIG}"; then MAXMIND_PKG_NAME="" - for x in ${MAXMIND_POSSIBLE_LIB_NAMES}; do - if ${PKG_CONFIG} --exists ${x}; then - MAXMIND_PKG_NAME="$x" - break - fi - done + if ${PKG_CONFIG} --exists libmaxminddb; then + MAXMIND_PKG_NAME="libmaxminddb" + break + fi fi AC_MSG_NOTICE([Nothing about MaxMind was informed during the configure phase. Trying to detect it on the platform...]) if test -n "${MAXMIND_PKG_NAME}"; then From 503804beb5c0fa1f637333fd3d018c6ad1eaa804 Mon Sep 17 00:00:00 2001 From: Martin Vierula Date: Mon, 5 Dec 2022 07:27:14 -0800 Subject: [PATCH 2/2] Add CHANGES entry for previous PR --- CHANGES | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES b/CHANGES index edf1540d..69721972 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ v3.x.y - YYYY-MMM-DD (to be released) ------------------------------------- + - Use name package name libmaxminddb with pkg-config + [Issue #2595, #2596 - @frankvanbever, @ffontaine, @arnout] - Fix: FILES_TMP_CONTENT collection key should use part name [Issue #2831 - @airween] - Use AS_HELP_STRING instead of obsolete AC_HELP_STRING macro