Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ext/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ 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"

Comment thread
remicollet marked this conversation as resolved.
AC_DEFINE([HAVE_LIBMAXMINDDB_BUNDLED], [1], [Use bundled or system libmaxminddb])
Comment thread
remicollet marked this conversation as resolved.
else
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)

Expand Down
2 changes: 2 additions & 0 deletions ext/config.w32
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ if (PHP_MAXMINDDB == "yes") {
* ask for it explicitly too, and the dependency is ours now. */
ADD_FLAG("LIBS_MAXMINDDB", "ws2_32.lib");

AC_DEFINE("HAVE_LIBMAXMINDDB_BUNDLED", 1, "Use bundled or system libmaxminddb");

EXTENSION("maxminddb", "maxminddb.c");

/* This has to come after EXTENSION, which is what makes CFLAGS_MAXMINDDB
Expand Down
7 changes: 6 additions & 1 deletion ext/maxminddb.c
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,12 @@ 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());
3, "libmaxminddb library version", MMDB_lib_version(),
#ifdef HAVE_LIBMAXMINDDB_BUNDLED
"(bundled)");
#else
"(system)");
#endif

php_info_print_table_end();
}
Expand Down
Loading