Merge branch 'v3/master' into v3/master

CHANGES

@@ -3,6 +3,8 @@ v3.x.y - YYYY-MMM-DD (to be released)
 
   - Support comments in ipMatchFromFile file via '#' token
     [Issue #2554 - @tomsommer, @martinhsv]
+  - 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

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