From 30ddfe8d9593e6a483d5925f0973b8299b5b09cb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 11 Sep 2026 10:13:13 +0200 Subject: [PATCH] report if libmaxminddb is bundled or system --- ext/config.m4 | 3 +++ ext/maxminddb.c | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ext/config.m4 b/ext/config.m4 index e4357e6..6606d9d 100644 --- a/ext/config.m4 +++ b/ext/config.m4 @@ -77,6 +77,9 @@ if test $PHP_MAXMINDDB != "no"; then CFLAGS="$CFLAGS -fvisibility=hidden -UHAVE_CONFIG_H -DHAVE_CONFIG_H=0 -DMMDB_UINT128_USING_MODE=0 -DMMDB_UINT128_IS_BYTE_ARRAY=1" maxminddb_sources="$maxminddb_sources libmaxminddb/src/maxminddb.c libmaxminddb/src/data-pool.c" + + AC_DEFINE([HAVE_LIBMAXMINDDB_BUNDLED], [1], [Use bundled or system libmaxminddb]) + PHP_SUBST([HAVE_LIBMAXMINDDB_BUNDLED]) else AC_PATH_PROG(PKG_CONFIG, pkg-config, no) diff --git a/ext/maxminddb.c b/ext/maxminddb.c index 849b00e..2068de7 100644 --- a/ext/maxminddb.c +++ b/ext/maxminddb.c @@ -798,7 +798,11 @@ static PHP_MINFO_FUNCTION(maxminddb) { php_info_print_table_row( 2, "maxminddb extension version", PHP_MAXMINDDB_VERSION); php_info_print_table_row( - 2, "libmaxminddb library version", MMDB_lib_version()); +#ifdef HAVE_LIBMAXMINDDB_BUNDLED + 2, "libmaxminddb bundled library version", MMDB_lib_version()); +#else + 2, "libmaxminddb system library version", MMDB_lib_version()); +#endif php_info_print_table_end(); }